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

---
 .gitlab-ci.yml |  2 +-
 Dockerfile     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8061c84..aba0f05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 - build
 
 variables:
-  VERSION: 3.17c-${ARCH}
+  VERSION: 3.18a-${ARCH}
   CACHETAG: build-${ARCH}
   DOCKER_HOST: tcp://docker:2375
 
diff --git a/Dockerfile b/Dockerfile
index d5643a7..bd30d53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # NAME leenooks/sbbs
-# VERSION 3.17c
+# VERSION 3.18a
 
 FROM debian:buster-slim
 
@@ -14,14 +14,14 @@ 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 [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 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/*
@@ -36,7 +36,7 @@ RUN apt-get update \
 
 # 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 \
@@ -50,7 +50,7 @@ RUN apt-get update \
     && 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 \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*