„scripts/start.sh“ ändern

.github/FUNDING.yml

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

Dockerfile

@@ -1,10 +1,10 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+FROM ich777/debian-baseimage
 
 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 lib32z1 lsof libicu67 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 libgl1 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -34,4 +34,4 @@ ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,48 +1,39 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike 2 and run it.
+This Docker will download and install SteamCMD. It will also install America's Army: Proving Grounds and run it.
 
-**ATTENTION:** You have to provide a valid Steam account with the game in it is Library and SteamGuard completely disabled so that the download is working!  
-_It is recommended that you create dedicated Steam account for your dedicated servers with the games in it and SteamGuard completely disabled!_  
-**DON'T DISABLE STEAM GUARD ON YOUR PRIMARY ACCOUNT!!!**
+Update Notice: Simply restart the container if a newer version of the game is available.
 
-**ATTENTION:** First Startup can take very long since it downloads the gameserver files!
-
-**PUBLIC PLAY:** If you want that your server is public listed you must add '+sv_setsteamaccount YOURTOKEN' to the GAME_PARAMS (without the quotes and replace YOURTOKEN with your token).  
-Create your token here: https://steamcommunity.com/dev/managegameservers (every gameserver needs it's own token!!!)  
-
-You can also run multiple servers with only one SteamCMD directory!
-
-## Example Env
+## Env params
 | 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: '730 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 730 |
-| USERNAME | Leave blank for anonymous login | \<STEAMUSER> |
-| PASSWRD | Leave blank for anonymous login | \<STEAMPASSWORD> |
-| GAME_PARAMS | Values to start the server | -dedicated -dev +map de_inferno +game_type 0 +game_mode 1 -usercon |
+| 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: '203300 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 203300 |
+| SRV_NAME | The server name | Army Docker |
+| GAME_PARAMS | Values to start the server | -port=7778 -SAP=8778 -SQP=27015 -aauregion=1 -log=Server.log |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | blank |
+| VALIDATE | Validates the game data | true |
+| USERNAME | Leave blank for anonymous login | blank |
+| PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name CS2 -d \
-	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=730' \
-	--env 'USERNAME=<STEAMUSER>' \
-	--env 'PASSWRD=<STEAMPASSWORD>' \
-	--env 'GAME_PARAMS=-dedicated -dev +map de_inferno +game_type 0 +game_mode 1 -usercon' \
+docker run --name AmericasArmy-PG -d \
+	-p 7778:7778/udp -p 8778:8778/udp -p 27015:27015/udp \
+	--env 'GAME_ID=203300' \
+	--env 'SRV_NAME=Army Docker' \
+	--env 'GAME_PARAMS=-port=7778 -SAP=8778 -SQP=27015 -aauregion=1 -log=Server.log' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cs2:/serverdata/serverfiles \
-	ich777/steamcmd:cs2
+	--volume /path/to/americasarmy-pg:/serverdata/serverfiles \
+	ich777/steamcmd:aaprovinggrounds
 ```
 
 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/
+### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

scripts/start-server.sh

@@ -51,18 +51,9 @@ else
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk64/steamclient.so ]; then
-	if [ ! -d ${DATA_DIR}/.steam ]; then
-    	mkdir ${DATA_DIR}/.steam
-    fi
-	if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk64
-    fi
-    cp -R ${STEAMCMD_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
-fi
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/game/bin/linuxsteamrt64/cs2 ${GAME_PARAMS}
+${SERVER_DIR}/Binaries/Linux/AAPG -servername=\"${SRV_NAME}\" ${GAME_PARAMS}

scripts/start.sh

@@ -26,8 +26,9 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
-	wait "$killpid" -f 2>/dev/null
+	kill -SIGINT $(pidof AAPG)
+	tail --pid=$(pidof AAPG) -f 2>/dev/null
+	sleep 0.5
 	exit 143;
 }
 
@@ -38,4 +39,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done