From 6ce8e626f149d37806e5c2a532aec20a5b13edd5 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 13 May 2020 22:39:06 +1000
Subject: [PATCH] Remove makenl, update to 3.18a

---
 .gitlab-ci.yml |  3 +--
 Dockerfile     | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c484224..aba0f05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,8 @@ stages:
 - build
 
 variables:
-  VERSION: 3.17c-${ARCH}
+  VERSION: 3.18a-${ARCH}
   CACHETAG: build-${ARCH}
-  DOCKER_DRIVER: overlay
   DOCKER_HOST: tcp://docker:2375
 
 services:
diff --git a/Dockerfile b/Dockerfile
index e23493e..fa3d5c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 # NAME leenooks/sbbs
-# VERSION 3.17c
+# VERSION 3.18a
 
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 # Base utilities
 RUN apt-get update \
-    && apt-get install -yqq curl supervisor procps less zip unzip arj unrar-free lhasa arc zoo logrotate libmozjs185-1.0 cron \
+    && apt-get install -yqq curl supervisor procps less zip unzip arj unrar-free lhasa arc logrotate cron php-cgi php-fpm \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -14,34 +14,43 @@ RUN apt-get update \
 RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
 
 # Add in Leenooks' apt repository
-RUN curl -s http://apt.leenooks.net/setup.sh | sh
+RUN curl -s http://apt.leenooks.net/buster/setup.sh | sh
 
 # Add ZeroTier
-RUN echo "deb http://download.zerotier.com/debian/stretch stretch main" > /etc/apt/sources.list.d/zerotier.list
+RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
 
 # Leenooks Utils
 RUN apt-get update \
-    && apt-get install -yqq --allow-unauthenticated makenl zerotier-one \
+    && apt-get install -yqq zerotier-one \
+    && apt-get -y autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Other Utilities
+RUN echo "deb http://deb.debian.org/debian stretch main contrib" > /etc/apt/sources.list.d/contrib.list
+RUN apt-get update \
+    && apt-get install -yqq libmozjs185-1.0 \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Build SBBS
 RUN apt-get update \
-    && apt-get install -yqq build-essential libnspr4-dev libncurses5-dev libmozjs185-dev cvs wget pkgconf \
+    && apt-get install -yqq build-essential libnspr4-dev libncurses5-dev libmozjs185-dev cvs wget pkgconf sudo \
     && mkdir /opt/sbbs && cd /tmp \
     && wget http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/install/GNUmakefile \
     && make RELEASE=1 USE_DOSEMU=1 NO_X=1 JSINCLUDE=/usr/include/js JSLIB=mozjs185 SBBSDIR=/opt/sbbs install \
     && rm -rf /opt/sbbs/3rdp /opt/sbbs/src \
     && mv /opt/sbbs/ctrl /opt/sbbs/ctrl.orig \
     && mv /opt/sbbs/text /opt/sbbs/text.orig \
-    && mkdir /opt/sbbs/nodes.orig && mv /opt/sbbs/node[1-4] /opt/sbbs/nodes.orig \
+    && mkdir /opt/sbbs/nodes.orig && mv /opt/sbbs/node[1-5] /opt/sbbs/nodes.orig \
     && ln -sf nodes/node1 /opt/sbbs/ \
     && ln -sf nodes/node2 /opt/sbbs/ \
     && ln -sf nodes/node3 /opt/sbbs/ \
     && ln -sf nodes/node4 /opt/sbbs/ \
+    && ln -sf nodes/node5 /opt/sbbs/ \
     && find /opt/sbbs -name CVS -type d -exec rm -rf {} + \
-    && apt-get -y purge build-essential libnspr4-dev libncurses5-dev libmozjs185-dev cvs wget pkgconf \
+    && SUDO_FORCE_REMOVE=yes apt-get -y purge build-essential libnspr4-dev libncurses5-dev libmozjs185-dev cvs wget pkgconf sudo \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*