From 01f57ef00a7e583ab77b9177798483117e856163 Mon Sep 17 00:00:00 2001
From: sairuk <sairuk@gmail.com>
Date: Sat, 16 Feb 2019 10:43:45 +1100
Subject: [PATCH] - Container no longer runs in root context, now switches to
 gameserv user before launching server - Removed supervisord dependancy - Add
 (assumed) additional mod folders

---
 Dockerfile                                  | 8 ++++----
 _custom/Construction/scripts/autoexec/dummy | 0
 _custom/FuryTV/scripts/autoexec/dummy       | 0
 _custom/Meltdown2/scripts/autoexec/dummy    | 0
 _custom/Mousemod/scripts/autoexec/dummy     | 0
 _custom/Shifter/scripts/autoexec/dummy      | 0
 _custom/Triumph/scripts/autoexec/dummy      | 0
 _custom/tac/scripts/autoexec/dummy          | 0
 _custom/variant/scripts/autoexec/dummy      | 0
 supervisord.conf                            | 5 -----
 10 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 _custom/Construction/scripts/autoexec/dummy
 create mode 100644 _custom/FuryTV/scripts/autoexec/dummy
 create mode 100644 _custom/Meltdown2/scripts/autoexec/dummy
 create mode 100644 _custom/Mousemod/scripts/autoexec/dummy
 create mode 100644 _custom/Shifter/scripts/autoexec/dummy
 create mode 100644 _custom/Triumph/scripts/autoexec/dummy
 create mode 100644 _custom/tac/scripts/autoexec/dummy
 create mode 100644 _custom/variant/scripts/autoexec/dummy
 delete mode 100644 supervisord.conf

diff --git a/Dockerfile b/Dockerfile
index 7e4df2d..ea7a361 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,6 @@ sudo unzip \
 rsyslog \
 # -- utilities
 sed less vim file \
-# -- supervisor
-supervisor \
 # --- wine
 wine \
 # -- display
@@ -68,6 +66,8 @@ EXPOSE \
 666/tcp \
 28000/udp 
 
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-CMD ["/usr/bin/supervisord","-c","/etc/supervisor/conf.d/supervisord.conf"]
+USER ${SRVUSER}
+WORKDIR /home/${SRVUSER}
+
+CMD ["./start-server"]
 
diff --git a/_custom/Construction/scripts/autoexec/dummy b/_custom/Construction/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/FuryTV/scripts/autoexec/dummy b/_custom/FuryTV/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/Meltdown2/scripts/autoexec/dummy b/_custom/Meltdown2/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/Mousemod/scripts/autoexec/dummy b/_custom/Mousemod/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/Shifter/scripts/autoexec/dummy b/_custom/Shifter/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/Triumph/scripts/autoexec/dummy b/_custom/Triumph/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/tac/scripts/autoexec/dummy b/_custom/tac/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/_custom/variant/scripts/autoexec/dummy b/_custom/variant/scripts/autoexec/dummy
new file mode 100644
index 0000000..e69de29
diff --git a/supervisord.conf b/supervisord.conf
deleted file mode 100644
index 45f5689..0000000
--- a/supervisord.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:tribes2-server]
-command=/bin/su - gameserv -c /home/gameserv/start-server