„scripts/start.sh“ ändern

Dockerfile

@@ -1,9 +1,10 @@
-FROM ich777/debian-baseimage
+FROM ich777/winehq-baseimage
 
-LABEL maintainer="admin@minenet.at"
+LABEL org.opencontainers.image.authors="admin@minenet.at"
+LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
 RUN apt-get update && \
-	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 xvfb winbind && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"

README.md

@@ -1,50 +1,43 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
+This Docker will download and install SteamCMD. It will also install LambdaWars and run it.
 
-**Please see the different Tags/Branches which games are available.**
+**STEAM CREDENTIALS:** For this container you have to provide valid Steam credentials where SteamGuard is disabled and this user need to have the game in it's library (since this game is free you can simply add it to this account).
+It is recommended to create a dedicated Steam account for dedicated servers so that account theft of your personal account is impossible.
 
 ## Example Env params for CS:Source
 | Name | Value | Example |
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| 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: '232330 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 232330 |
+| 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: '319060 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 319060 |
-| GAME_NAME | SRCDS gamename | cstrike |
+| GAME_NAME | SRCDS gamename | lambdawars |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| GAME_PARAMS | Values to start the server | +maxplayers 8 +map gamelobby |
 | 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 | blank |
 | 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, but not all games need Steam credentials, Steam recommends to create a seperate account for dedicated servers **
+## Run example
-
->**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 for CS:Source
 ```
-docker run --name CSSource -d \
+docker run --name LambdaWars -d \
-	-p 27015:27015 -p 27015:27015/udp \
+	-p 27015:27015/udp -p 27005:27005/udp -p 27020:27020/udp -p 26901:26901/udp -p 27015:27015 \
-	--env 'GAME_ID=232330' \
+	--env 'GAME_ID=319060' \
-	--env 'GAME_NAME=cstrike' \
+	--env 'GAME_NAME=lambdawars' \
 	--env 'GAME_PORT=27015' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+	--env 'USERNAME=YOURSTEAMUSER' \
+	--env 'PASSWRD=YOURSTEAMPASSWORD' \
+	--env 'GAME_PARAMS=+maxplayers 8 +map gamelobby' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /mnt/user/appdata/cstrikesource:/serverdata/serverfiles \
+	--volume /path/to/lambdawars:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	ich777/steamcmd:lambdawars
 ```
->**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

@@ -8,9 +8,8 @@ fi
 
 echo "---Update SteamCMD---"
 if [ "${USERNAME}" == "" ]; then
-    ${STEAMCMD_DIR}/steamcmd.sh \
+    echo "Please enter a valid username and password and restart the container. ATTENTION: Steam Guard must be DISABLED!!!"
-    +login anonymous \
+    sleep infinity
-    +quit
 else
     ${STEAMCMD_DIR}/steamcmd.sh \
     +login ${USERNAME} ${PASSWRD} \
@@ -18,54 +17,54 @@ else
 fi
 
 echo "---Update Server---"
-if [ "${USERNAME}" == "" ]; then
+if [ "${VALIDATE}" == "true" ]; then
-    if [ "${VALIDATE}" == "true" ]; then
+    echo "---Validating installation---"
-    	echo "---Validating installation---"
+    ${STEAMCMD_DIR}/steamcmd.sh \
-        ${STEAMCMD_DIR}/steamcmd.sh \
+    +@sSteamCmdForcePlatformType windows \
-        +force_install_dir ${SERVER_DIR} \
+    +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
+    +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} validate \
+    +app_update ${GAME_ID} validate \
-        +quit
+    +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
 else
-    if [ "${VALIDATE}" == "true" ]; then
+    ${STEAMCMD_DIR}/steamcmd.sh \
-    	echo "---Validating installation---"
+    +@sSteamCmdForcePlatformType windows \
-        ${STEAMCMD_DIR}/steamcmd.sh \
+    +force_install_dir ${SERVER_DIR} \
-        +force_install_dir ${SERVER_DIR} \
+    +login ${USERNAME} ${PASSWRD} \
-        +login ${USERNAME} ${PASSWRD} \
+    +app_update ${GAME_ID} \
-        +app_update ${GAME_ID} validate \
+    +quit
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
+export WINEARCH=win64
-	if [ ! -d ${DATA_DIR}/.steam ]; then
+export WINEPREFIX=/serverdata/serverfiles/WINE64
-    	mkdir ${DATA_DIR}/.steam
+export DISPLAY=:99
-    fi
+echo "---Checking if WINE workdirectory is present---"
-	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
+if [ ! -d ${SERVER_DIR}/WINE64 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk32
+	echo "---WINE workdirectory not found, creating please wait...---"
-    fi
+    mkdir ${SERVER_DIR}/WINE64
-    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
+else
+	echo "---WINE workdirectory found---"
 fi
+echo "---Checking if WINE is properly installed---"
+if [ ! -d ${SERVER_DIR}/WINE64/drive_c/windows ]; then
+	echo "---Setting up WINE---"
+    cd ${SERVER_DIR}
+    winecfg > /dev/null 2>&1
+    sleep 15
+else
+	echo "---WINE properly set up---"
+fi
+echo "---Checking for old display lock files---"
+find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
-echo "---Sleep zZzZz---"
+echo "---Starting Xvfb server---"
-sleep infinity
+Xvfb :99 -screen scrn 640x480x16 2>/dev/null &
+sleep 3
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+wine64 start srcds.exe -console -game ${GAME_NAME} ${GAME_PARAMS} +port ${GAME_PORT}
+sleep 1
+tail --pid=$(pgrep srcds.exe) -f /dev/null

scripts/start.sh

@@ -1,25 +1,30 @@
 #!/bin/bash
-echo "---Checking if UID: ${UID} matches user---"
+echo "---Ensuring UID: ${UID} matches user---"
 usermod -u ${UID} ${USER}
-echo "---Checking if GID: ${GID} matches 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---"
-if [ -f /opt/scripts/user.sh ]; then
+cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
-	echo "---Found optional script, executing---"
+cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
-    chmod +x /opt/scripts/user.sh
+
-    /opt/scripts/user.sh
+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---"
+    echo "---No optional script found, continuing---"
 fi
 
-echo "---Starting...---"
+echo "---Taking ownership of data...---"
 chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
 
+echo "---Starting...---"
 term_handler() {
 	kill -SIGTERM "$killpid"
 	wait "$killpid" -f 2>/dev/null