Dockerfile aktualisiert

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: ich777

Dockerfile

@@ -1,9 +1,15 @@
-FROM ubuntu
+FROM ich777/debian-baseimage
 
-MAINTAINER ich777
+LABEL org.opencontainers.image.authors="admin@minenet.at"
+LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
-RUN apt-get update
-RUN apt-get -y install lib32gcc1 libc6-i386 wget language-pack-en lib32stdc++6
+RUN apt-get update && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 libatomic1 libx11-6 && \
+	rm -rf /var/lib/apt/lists/*
+
+RUN wget -O /tmp/libs.tar https://github.com/ich777/docker-steamcmd-server/raw/ets2/libs/3rd_party_libs.tar && \
+	tar -C /usr/lib/x86_64-linux-gnu/ -xvf /tmp/libs.tar && \
+	rm -rf /tmp/libs.tar
 
 ENV DATA_DIR="/serverdata"
 ENV STEAMCMD_DIR="${DATA_DIR}/steamcmd"
@@ -13,24 +19,24 @@ ENV GAME_NAME="template"
 ENV GAME_PARAMS="template"
 ENV GAME_PORT=27015
 ENV VALIDATE=""
+ENV UMASK=000
 ENV UID=99
 ENV GID=100
 ENV USERNAME=""
 ENV PASSWRD=""
+ENV USER="steam"
+ENV DATA_PERM=770
 
-RUN mkdir $DATA_DIR
-RUN mkdir $STEAMCMD_DIR
-RUN mkdir $SERVER_DIR
-RUN useradd -d $DATA_DIR -s /bin/bash --uid $UID --gid $GID steam
-RUN chown -R steam $DATA_DIR
-
-RUN ulimit -n 2048
+RUN mkdir $DATA_DIR && \
+	mkdir $STEAMCMD_DIR && \
+	mkdir $SERVER_DIR && \
+	useradd -d $SERVER_DIR -s /bin/bash $USER && \
+	chown -R $USER $DATA_DIR && \
+	ulimit -n 2048
 
 ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
-RUN chown -R steam /opt/scripts
-
-USER steam
+COPY config.tar /opt/config.tar
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-server.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,45 +1,45 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike: Source and run it. Update Notice: Simply restart the container if a newer version of the game is available.
+This Docker will download and install SteamCMD. It will also install Euro Truck Simulator 2 and run it.
 
-## Env params
+**Server Credentials:** The default name from the server is: **Docker Server** and the password is: **Docker**
+
+**ATTENTION:** First Startup can take very long since it downloads the gameserver files and the world template!
+
+**Server Configuration:** For more information see the file 'server_readme.txt' in the main directory from the dedicated server.
+
+**Save Path:** The configuration files and save data is located in: '.../.local/share/American Truck Simulator '.
+
+**Update Notice:** Simply restart the container if a newer version of the game is available.
+
+You can also run multiple servers with only one SteamCMD directory!
+
+## Example Env params
 | Name | Value | Example |
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| GAME_ID | SteamID for server | 232330 |
-| GAME_NAME | SRCDS gamename | cstrike |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| GAME_ID | The GAME_ID that the container downloads at startup. If you want to install a static or beta version of the game change the value to: '1948160 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 1948160 |
+| GAME_PARAMS | Enter your game parameters (only change the worldId if you know what you are doing!) | empty |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | true |
+| VALIDATE | Validates the game data | false |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-***ATTENTION: You have to disable Steam Guard for games that require authentication, Steam recommends to create a seperate account for dedicated servers***
-
->**NOTE** GAME_ID values can be found [here](https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)
-
-> And for GAME_NAME there is no list, so a quick search should give you the result
-
 ## Run example
 ```
-docker run --name CSSource -d \
-	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=232330' \
-	--env 'GAME_NAME=cstrike' \
-	--env 'GAME_PORT=27015' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+docker run --name EuroTruckSimulator2 -d \
+	-p 27015-27016:27015-27016/udp \
+	--env 'GAME_ID=1948160' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
-	--volume /mnt/user/appdata/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/eurotrucksimulator2/serverdata/serverfiles \
+	ich777/steamcmd:ets2
 ```
->**NOTE** port 26900 is the port for vac, in case of multiple servers make sure these are not the same
-
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!
 
-
 This Docker is forked from mattieserver, thank you for this wonderfull Docker.
+
+#### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

scripts/start-server.sh

@@ -20,46 +20,58 @@ fi
 echo "---Update Server---"
 if [ "${USERNAME}" == "" ]; then
     if [ "${VALIDATE}" == "true" ]; then
+    	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +login anonymous \
         +force_install_dir ${SERVER_DIR} \
+        +login anonymous \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +login anonymous \
         +force_install_dir ${SERVER_DIR} \
+        +login anonymous \
         +app_update ${GAME_ID} \
         +quit
     fi
 else
     if [ "${VALIDATE}" == "true" ]; then
+    	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +login ${USERNAME} ${PASSWRD} \
         +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +login ${USERNAME} ${PASSWRD} \
         +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} \
         +quit
     fi
 fi
 
 echo "---Prepare Server---"
-if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
-    mkdir ${DATA_DIR}/.steam/sdk32
-    cp -R ${SERVER_DIR}/bin/* ${DATA_DIR}/.steam/sdk32/
-    echo "---Server ready---"
-else
-    echo "---Server ready---"
+echo "---Looking if Server config is in place---"
+if [ ! -d "$SERVER_DIR/.local/share/Euro Truck Simulator 2" ]; then
+  mkdir -p "$SERVER_DIR/.local/share/Euro Truck Simulator 2"
 fi
-chmod -R 770 ${DATA_DIR}
+if [ ! -f "$SERVER_DIR/.local/share/Euro Truck Simulator 2/server_packages.dat" ]; then
+  echo "---Server config not found, copying default...---"
+  tar -C "$SERVER_DIR/.local/share/Euro Truck Simulator 2" -xvf /opt/config.tar
+else
+  echo "---Server config found!---"
+fi
+
+if [ ! -f ${SERVER_DIR}/.steam/sdk64/steamclient.so ]; then
+	if [ ! -d ${SERVER_DIR}/.steam/sdk64 ]; then
+    	mkdir -p ${SERVER_DIR}/.steam/sdk64
+    fi
+    cp -R ${STEAMCMD_DIR}/linux64/* ${SERVER_DIR}/.steam/sdk64/
+fi
+chmod -R ${DATA_PERM} ${DATA_DIR}
+echo "---Server ready---"
 
 echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} +port ${GAME_PORT}
-
-
-
+export LD_LIBRARY_PATH=$SERVER_DIR/linux64
+cd ${SERVER_DIR}/bin/linux_x64
+${SERVER_DIR}/bin/linux_x64/eurotrucks2_server ${GAME_PARAMS}

scripts/start.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+echo "---Ensuring UID: ${UID} matches user---"
+usermod -u ${UID} ${USER}
+echo "---Ensuring GID: ${GID} matches user---"
+groupmod -g ${GID} ${USER} > /dev/null 2>&1 ||:
+usermod -g ${GID} ${USER}
+echo "---Setting umask to ${UMASK}---"
+umask ${UMASK}
+
+echo "---Checking for optional scripts---"
+cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
+cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
+
+if [ -f /opt/scripts/start-user.sh ]; then
+    echo "---Found optional script, executing---"
+    chmod -f +x /opt/scripts/start-user.sh ||:
+    /opt/scripts/start-user.sh || echo "---Optional Script has thrown an Error---"
+else
+    echo "---No optional script found, continuing---"
+fi
+
+echo "---Taking ownership of data...---"
+chown -R root:${GID} /opt/scripts
+chmod -R 750 /opt/scripts
+chown ${UID}:${GID} /opt/config.tar
+chmod 750 /opt/config.tar
+chown -R ${UID}:${GID} ${DATA_DIR}
+
+echo "---Starting...---"
+term_handler() {
+	kill -SIGINT $(pidof pidof eurotrucks2_server)
+	tail --pid=$(pidof pidof eurotrucks2_server) -f 2>/dev/null
+	exit 143;
+}
+
+trap 'kill ${!}; term_handler' SIGTERM
+su ${USER} -c "/opt/scripts/start-server.sh" &
+killpid="$!"
+while true
+do
+	wait $killpid
+	exit 0;
+done