Merge pull request #1430 from tgstation/FixContainerEnvVars [TGSDeploy]

Fix Environment variables being overwritten by container script

build/Version.props

@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.3.1</TgsCoreVersion>
+    <TgsCoreVersion>5.3.2</TgsCoreVersion>
     <TgsConfigVersion>4.4.0</TgsConfigVersion>
     <TgsApiVersion>9.8.1</TgsApiVersion>
     <TgsApiLibraryVersion>10.2.0</TgsApiLibraryVersion>
@@ -11,7 +11,7 @@
     <TgsDmapiVersion>6.0.6</TgsDmapiVersion>
     <TgsInteropVersion>5.3.0</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.2.0</TgsHostWatchdogVersion>
-    <TgsContainerScriptVersion>1.2.0</TgsContainerScriptVersion>
+    <TgsContainerScriptVersion>1.2.1</TgsContainerScriptVersion>
     <TgsMigratorVersion>1.0.1</TgsMigratorVersion>
     <TgsNetVersion>net6.0</TgsNetVersion>
   </PropertyGroup>

build/tgs.docker.sh

@@ -1,17 +1,20 @@
 #!/bin/sh
 
-SCRIPT_VERSION="1.2.0"
+SCRIPT_VERSION="1.2.1"
 
-echo "tgstation-server 4 container startup script v$SCRIPT_VERSION"
+echo "tgstation-server container startup script v$SCRIPT_VERSION"
 echo "PWD: $PWD"
 
 PROD_CONFIG=/config_data/appsettings.Production.yml
 HOST_CONFIG=/app/appsettings.Production.yml
 
 if [ ! -f $PROD_CONFIG ]; then
+	if [ -z "${General__SetupWizardMode}" ]; then
+		export General__SetupWizardMode=Only
+	fi
+
 	echo "$PROD_CONFIG not detected! Creating empty and running setup wizard..."
 	# Important, config reloading doesn't work with symlinks
-	export General__SetupWizardMode=Only
 	echo "{}" > $PROD_CONFIG
 fi