fix(entrypoint): game path (#4)

Author: maximee-leroyy

Containerfile

@@ -20,8 +20,15 @@ RUN dpkg --add-architecture i386 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /var/log/*
 
+RUN mkdir -p /steamcmd \
+    && curl -sSL -o /tmp/steamcmd.tar.gz https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz \
+    && tar -xzvf /tmp/steamcmd.tar.gz -C /steamcmd \
+    && rm -rf /tmp/*
+
 RUN useradd -m -d /home/container container
 
+RUN chown container:container -R /steamcmd
+
 USER container
 
 ENV HOME /home/container

entrypoint.sh

@@ -2,8 +2,8 @@
 ##
 #
 # Variables
-# TZ - Setup local timezone
 # GAME_PATH - Root game path
+# STEAMCMD_PATH - SteamCMD path
 #
 ##
 
@@ -12,6 +12,11 @@ then
     export GAME_PATH=/home/container;
 fi
 
+if [ -z ${STEAMCMD_PATH} ];
+then
+    export STEAMCMD_PATH="$GAME_PATH";
+fi
+
 cd "$GAME_PATH"
 
 sleep 1
@@ -23,15 +28,18 @@ export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
 if [ ! -z ${SRCDS_APPID} ]; then
     if [ ! -z ${SRCDS_BETAID} ]; then
         if [ ! -z ${SRCDS_BETAPASS} ]; then
-            ./steamcmd/steamcmd.sh +login anonymous +force_install_dir /home/container +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} -betapassword ${SRCDS_BETAPASS} +quit
+            ./$STEAMCMD_PATH/steamcmd/steamcmd.sh +login anonymous +force_install_dir "$GAME_PATH" +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} -betapassword ${SRCDS_BETAPASS} +quit
         else
-            ./steamcmd/steamcmd.sh +login anonymous +force_install_dir /home/container +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} +quit
+            ./$STEAMCMD_PATH/steamcmd/steamcmd.sh +login anonymous +force_install_dir "$GAME_PATH" +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} +quit
         fi
     else
-        ./steamcmd/steamcmd.sh +login anonymous +force_install_dir /home/container +app_update ${SRCDS_APPID} +quit
+        ./$STEAMCMD_PATH/steamcmd/steamcmd.sh +login anonymous +force_install_dir "$GAME_PATH" +app_update ${SRCDS_APPID} +quit
     fi
 fi
 
+# Use system libraries
+rm "${GAME_PATH}/bin/libstdc++.so.6" | true
+
 # Replace Startup Variables
 MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
 echo ":$GAME_PATH$ ${MODIFIED_STARTUP}"