From 273a605ea0f119310d123b8bc0ba3751821c3b1c Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 10 Sep 2020 00:25:25 +1000
Subject: [PATCH] Change CVS to GIT, added PHP

---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 956a6f2..baab749 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
 # NAME leenooks/sbbs
-# VERSION 3.18a
+# VERSION latest
 
 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 logrotate cron libnspr4 \
-    php-cgi php-fpm php-sqlite3 php-xml \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -15,7 +14,7 @@ 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/buster/setup.sh | sh
+RUN curl -s https://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
@@ -37,9 +36,9 @@ RUN apt-get update \
 
 # Build SBBS
 RUN apt-get update \
-    && apt-get install -yqq build-essential libnspr4-dev libncurses5-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \
+    && apt-get install -yqq git build-essential libnspr4-dev libncurses5-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \
     && mkdir /opt/sbbs && cd /tmp \
-    && wget http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/install/GNUmakefile \
+    && wget https://gitlab.synchro.net/sbbs/sbbs/-/raw/master/install/GNUmakefile \
     && make RELEASE=1 USE_DOSEMU=1 NO_X=1 SBBSDIR=/opt/sbbs install \
     && rm -rf /opt/sbbs/3rdp /opt/sbbs/src \
     && mv /opt/sbbs/ctrl /opt/sbbs/ctrl.orig \
@@ -51,7 +50,14 @@ 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 {} + \
-    && SUDO_FORCE_REMOVE=yes apt-get -y purge build-essential libnspr4-dev libncurses5-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \
+    && SUDO_FORCE_REMOVE=yes apt-get -y purge git build-essential libnspr4-dev libncurses5-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \
+    && apt-get -y autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Add PHP
+RUN apt-get update \
+    && apt-get install -yqq composer php-cgi php-fpm php-gd php-sqlite3 php-xml \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*