From 2c14276035a49862999dd03cfd50a71d051b7cb6 Mon Sep 17 00:00:00 2001
From: ChocoTaco <boldfilter@zoho.com>
Date: Sun, 5 Jan 2020 15:37:15 -0500
Subject: [PATCH] Battlelore changes

---
 Dockerfile                           |  9 ++++-----
 _scripts/tribesnext-server-installer | 10 +++++++---
 docker-compose.yml                   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 538a604..05e0e74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,9 @@ ARG SRVUSER=gameserv
 ARG SRVUID=1000
 ARG SRVDIR=/tmp/tribes2/
 ENV INSTDIR=/home/${SRVUSER}/.loki/tribes2/
+ENV TZ="America/New_York"
+# -- shutup installers
+ENV DEBIAN_FRONTEND noninteractive
 
 
 # UPDATE IMAGE
@@ -41,15 +44,11 @@ rsyslog \
 # -- utilities
 sed less nano vim file wget curl gnupg2 netcat software-properties-common xdelta3 tzdata
 
+#RUN timedatectl set-timezone ${TZ}
 
 # CLEAN IMAGE
 RUN apt-get -y clean && apt-get -y autoremove
 
-
-# ENV
-# -- shutup installers
-ENV DEBIAN_FRONTEND noninteractive
-
 # USER
 # -- add the user, expose datastore
 RUN useradd -m -s /bin/bash -u ${SRVUID} ${SRVUSER}
diff --git a/_scripts/tribesnext-server-installer b/_scripts/tribesnext-server-installer
index 40e19df..23a5a87 100755
--- a/_scripts/tribesnext-server-installer
+++ b/_scripts/tribesnext-server-installer
@@ -23,9 +23,7 @@ then
     mkdir -p $INSBASE/tribes2/Manual
     mkdir -p $INSBASE/tribes2/base/{music,lighting,textures,prefs}
     mkdir -p $INSBASE/tribes2/Classic/scripts/{turrets,weapons,autoexec,packs,vehicles}
-	mkdir -p $INSBASE/tribes2/Classic/stats
-	mkdir -p $INSBASE/tribes2/Classic/serverStats
-	mkdir -p $INSBASE/tribes2/Classic/logs
+	mkdir -p $INSBASE/tribes2/Classic/{logs,stats,serverStats}
 fi
 
 
@@ -78,4 +76,10 @@ then
     echo "Finished setting up T2!"
 fi
 
+echo "Binding console.log to container logs"
+touch console.log
+touch $INSBASE/tribes2/console.log
+ln -sf /proc/1/fd/1 console.log
+ln -sf /proc/1/fd/1 $INSBASE/tribes2/console.log
+
 exit 0
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4c52a17..0f9d0ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       context: .
       dockerfile: ./Dockerfile
     environment:
+      TZ: "America/New_York"
       T2_SERVERNAME: "Docker Test"
       T2_MAX_PLAYERS: 64
       T2_DEFAULT_MISSIONTYPE: "Lakrabbit"
@@ -54,7 +55,6 @@ services:
       T2_LoadScreenMOTD2: "This is a Loki Linux Server!"
       T2_LoadScreenMOTD3: " "
       T2_LoadScreenMOTD4: " "
-      TZ: America/New_York
     secrets:
       - t2.admin.password
       - t2.classic.superadmin.password