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

Put back NNCP, sbbs.pid is now in SBBSCTRL, remove cvs from build.

Browse Source
This commit is contained in:
Deon George 2023-04-14 13:26:06 +10:00
parent 7a32a52517
commit 1f612dd027
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Dockerfile
View File

@ -5,7 +5,7 @@ FROM debian:bullseye-slim
# Base utilities # Base utilities
RUN apt-get -o Acquire::ForceIPv4=true 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 -o Acquire::ForceIPv4=true install -yqq curl supervisor procps less zip unzip arj unrar-free lhasa arc logrotate cron \
&& apt-get -y autoremove \ && apt-get -y autoremove \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@ -14,14 +14,14 @@ RUN apt-get -o Acquire::ForceIPv4=true update \
RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime 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 -o Acquire::ForceIPv4=true update \ RUN apt-get -o Acquire::ForceIPv4=true update \
# && apt-get install -yyq nncp less ssmtp \ && apt-get -o Acquire::ForceIPv4=true install -yyq nncp less ssmtp \
# && mkdir /etc/nncp \ && mkdir /etc/nncp \
# && apt-get -y autoremove \ && apt-get -y autoremove \
# && apt-get clean \ && apt-get clean \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
# Add in Leenooks' apt repository # Add in Leenooks' apt repository
#RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash #RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
@ -48,7 +48,7 @@ RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
# 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 -o Acquire::ForceIPv4=true 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 wget python2.7 pkgconf libcap2-bin sudo libarchive13 libnspr4 \
&& 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 \
&& git clone https://gitlab.com/SynchronetBBS/sbbs.git /opt/sbbs/repo \ && git clone https://gitlab.com/SynchronetBBS/sbbs.git /opt/sbbs/repo \
@ -60,7 +60,7 @@ RUN apt-get -o Acquire::ForceIPv4=true update \
&& mv /opt/sbbs/xtrn /opt/sbbs/xtrn.orig \ && mv /opt/sbbs/xtrn /opt/sbbs/xtrn.orig \
&& mkdir /opt/sbbs/nodes.orig && mv /opt/sbbs/node[1-5] /opt/sbbs/nodes.orig \ && mkdir /opt/sbbs/nodes.orig && mv /opt/sbbs/node[1-5] /opt/sbbs/nodes.orig \
&& find /opt/sbbs -name CVS -type d -exec rm -rf {} + \ && find /opt/sbbs -name CVS -type d -exec rm -rf {} + \
&& SUDO_FORCE_REMOVE=yes apt-get -y purge git build-essential autoconf2.13 libnspr4-dev libncurses5-dev libarchive-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \ && SUDO_FORCE_REMOVE=yes apt-get -y purge git build-essential autoconf2.13 libnspr4-dev libncurses5-dev libarchive-dev libncursesw5-dev wget pkgconf libcap2-bin sudo \
&& apt-get -y autoremove \ && apt-get -y autoremove \
&& apt-get clean \ && apt-get clean \
&& rm -rf /opt/sbbs/repo \ && rm -rf /opt/sbbs/repo \
@ -77,13 +77,14 @@ WORKDIR /opt/sbbs
ENV SBBSCTRL=/opt/sbbs/ctrl ENV SBBSCTRL=/opt/sbbs/ctrl
ENV SBBSEXEC=/opt/sbbs/exec ENV SBBSEXEC=/opt/sbbs/exec
ENV PATH=$PATH:${SBBSEXEC} ENV PATH=$PATH:${SBBSEXEC}
#ENV NNCPCFG /etc/nncp/nncp.conf ENV NNCPCFG /etc/nncp/nncp.conf
COPY start.sh ${SBBSEXEC}/ COPY start.sh ${SBBSEXEC}/
COPY doorparty.js ${SBBSEXEC}/ COPY doorparty.js ${SBBSEXEC}/
COPY main.cnf /opt/sbbs/ctrl.orig/ COPY main.cnf /opt/sbbs/ctrl.orig/
#VOLUME [ "/var/lib/zerotier-one","/var/spool/nncp","/etc/nncp" ] VOLUME [ "/var/lib/zerotier-one" ]
VOLUME [ "/var/spool/nncp","/etc/nncp" ]
VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text" ] VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text" ]
COPY logrotate.d /etc/logrotate.d/ COPY logrotate.d /etc/logrotate.d/

2
start.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
export SBBSCTRL=/opt/sbbs/ctrl export SBBSCTRL=/opt/sbbs/ctrl
PIDFILE=/run/sbbs.pid PIDFILE=${SBBSCTRL}/sbbs.pid
# Proxy signals # Proxy signals
function kill_app(){ function kill_app(){

5
supervisord.d/nncp.conf Normal file
View File

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