bbs/sbbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force apt to use IPv4, update config to have nodes in ../nodes/ now that SBBS 3.20 uses ini files

Browse Source
This commit is contained in:
Deon George 2023-01-22 11:43:58 +11:00
parent a20a9022ce
commit f321af3062
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -4,7 +4,7 @@
FROM debian:bullseye-slim FROM debian:bullseye-slim
# Base utilities # Base utilities
RUN apt-get update \ RUN apt-get -o Acquire::ForceIPv4=true update \
&& apt-get install -yqq curl supervisor procps less zip unzip arj unrar-free lhasa arc logrotate cron libnspr4 \ && apt-get install -yqq curl supervisor procps less zip unzip arj unrar-free lhasa arc logrotate cron libnspr4 \
&& apt-get -y autoremove \ && apt-get -y autoremove \
&& apt-get clean \ && apt-get clean \
@ -16,7 +16,7 @@ RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
# Add NNCP # Add NNCP
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
RUN apt-get update \ RUN apt-get -o Acquire::ForceIPv4=true update \
&& apt-get install -yyq nncp less ssmtp \ && apt-get install -yyq nncp less ssmtp \
&& mkdir /etc/nncp \ && mkdir /etc/nncp \
&& apt-get -y autoremove \ && apt-get -y autoremove \
@ -47,7 +47,7 @@ RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
# Build SBBS # Build SBBS
COPY 0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch /tmp/ COPY 0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch /tmp/
RUN apt-get update \ RUN apt-get -o Acquire::ForceIPv4=true update \
&& apt-get install -yqq git build-essential autoconf2.13 libnspr4-dev libncurses5-dev libncursesw5-dev libarchive-dev cvs wget python2.7 pkgconf libcap2-bin sudo libarchive13 \ && apt-get install -yqq git build-essential autoconf2.13 libnspr4-dev libncurses5-dev libncursesw5-dev libarchive-dev cvs wget python2.7 pkgconf libcap2-bin sudo libarchive13 \
&& mkdir /opt/sbbs && cd /tmp \ && mkdir /opt/sbbs && cd /tmp \
&& wget https://gitlab.synchro.net/sbbs/sbbs/-/raw/master/install/GNUmakefile \ && wget https://gitlab.synchro.net/sbbs/sbbs/-/raw/master/install/GNUmakefile \
@ -67,7 +67,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Add PHP # Add PHP
RUN apt-get update \ RUN apt-get -o Acquire::ForceIPv4=true update \
&& apt-get install -yqq composer php-cgi php-fpm php-gd php-sqlite3 php-xml \ && apt-get install -yqq composer php-cgi php-fpm php-gd php-sqlite3 php-xml \
&& apt-get -y autoremove \ && apt-get -y autoremove \
&& apt-get clean \ && apt-get clean \
@ -92,3 +92,6 @@ COPY supervisord.d /etc/supervisor/conf.d/
COPY init /sbin/init COPY init /sbin/init
ENTRYPOINT [ "/sbin/init" ] ENTRYPOINT [ "/sbin/init" ]
# Our ndoes are in ../nodes/node[0-9]
RUN sed -ie 's#=../node\([0-9]\+\)/#=../nodes/node\1/#' /opt/sbbs/ctrl.orig/main.ini

2
supervisord.d/nncp.conf
View File

@ -1,3 +1,5 @@
[program:nncp] [program:nncp]
#environment=NNCPCFG="/etc/nncp/nncp.conf" #environment=NNCPCFG="/etc/nncp/nncp.conf"
command=/usr/bin/nncp-daemon -autotoss command=/usr/bin/nncp-daemon -autotoss
startsecs=10
startretries=2