Merge branch 'joedwards32:main' into main

README.md

@@ -11,16 +11,16 @@ This Docker image contains the dedicated server of the game.
 # How to use this image
 ## Hosting a simple game server
 
-Running on the *host* interface (recommended) using Docker:<br/>
+Running using Docker:
 ```console
-$ docker run -d --net=host --name=cs2 -e STEAMUSER={YOUR_STEAM_USER} -e STEAMPASS={YOUR_STEAM_PASSWD} joedwards32/cs2
+$ docker run -d --name=cs2 -p 27015:27015 -p 27020:27020 joedwards32/cs2
 ```
 
 Running using a bind mount for data persistence on container recreation:
 ```console
 $ mkdir -p $(pwd)/cs2-data
 $ chmod 777 $(pwd)/cs2-data # Makes sure the directory is writeable by the unprivileged container user
-$ docker run -d --net=host -v $(pwd)/cs2-data:/home/steam/cs2-dedicated/ --name=cs2-dedicated -e STEAMUSER={YOUR_STEAM_USER} -e STEAMPASS={YOUR_STEAM_PASSWD} joedwards32/cs2
+$ docker run -d --name=cs2 -v $(pwd)/cs2-data:/home/steam/cs2-dedicated/ -p 27015:27015 -p 27020:27020 joedwards32/cs2
 ```
 
 or using docker-compose, see [examples](https://github.com/joedwards32/CS2/blob/main/examples/docker-compose.yml):
@@ -31,10 +31,6 @@ $ docker compose --file examples/docker-compose.yml up -d cs2-server
 
 You must have at least **40GB** of free disk space! See [System Requirements](./#system-requirements).
 
-`STEAMUSER` and `STEAMPASS` **are required as unlike CS:GO, CS2 can not be downloaded anonymously (at time of writing).**
-
-`STEAMGUARD` **must be used to provide your more recent Steam Guard key if Steam Guard is enabled on your account.**
-
 **The container will automatically update the game on startup, so if there is a game update just restart the container.**
 
 # Configuration
@@ -50,14 +46,6 @@ Minimum system requirements are:
 ## Environment Variables
 Feel free to overwrite these environment variables, using -e (--env): 
 
-### SteamCMD
-
-```dockerfile
-STEAMUSER="changeme"        (Steam User for SteamCMD.)
-STEAMPASS="changeme"        (Password for Steam User.)
-STEAMGUARD=""               (Optional, Steam Guard key if enabled. Use your most recent Steam Guard key.)
-```
-
 ### Server Configuration
 
 ```dockerfile

bullseye/Dockerfile

@@ -8,9 +8,6 @@ FROM cm2network/steamcmd:root as build_stage
 
 LABEL maintainer="joedwards32@gmail.com"
 
-ENV STEAMUSER "changeme"
-ENV STEAMPASS "changeme"
-ENV STEAMGUARD ""
 ENV STEAMAPPID 730
 ENV STEAMAPP cs2
 ENV STEAMAPPDIR "${HOMEDIR}/${STEAMAPP}-dedicated"

bullseye/etc/entry.sh

@@ -6,7 +6,7 @@ mkdir -p "${STEAMAPPDIR}" || true
 # Download Updates
 
 bash "${STEAMCMDDIR}/steamcmd.sh" +force_install_dir "${STEAMAPPDIR}" \
-				+login "${STEAMUSER}" "${STEAMPASS}" "${STEAMGUARD}" \
+				+login anonymous \
 				+app_update "${STEAMAPPID}" \
 				+quit
 

examples/docker-compose.yml

@@ -4,13 +4,8 @@ services:
     image: joedwards32/cs2
     container_name: cs2-dedicated
     environment:
-      # SteamCMD
-      - STEAMUSER=changeme          # (Steam User for SteamCMD.)
-      - STEAMPASS=changeme          # (Password for Steam User.)
-      - STEAMGUARD                  # (Optional, Steam Guard key if enabled. Use your most recent Steam Guard key.)
       # Server configuration
       - CS2_SERVERNAME=changeme     # (Set the visible name for your private server)
-      - CS2_IP=0.0.0.0              # (CS2 server listening IP address, 0.0.0.0 - all IP addresses on the local machine, empty - IP identified automatically)
       - CS2_PORT=27015              # (CS2 server listen port tcp_udp)
       - CS2_RCON_PORT               # (Optional, use a simple TCP proxy to have RCON listen on an alternative port. Useful for services like AWS Fargate which do not support mixed protocol ports.)
       - CS2_LAN=0                   # (0 - LAN mode disabled, 1 - LAN Mode enabled)