tailscale.sh aktualisiert

ensure group is linked correctly

Dockerfile

@@ -1,12 +1,10 @@
-FROM ich777/winehq-baseimage
+FROM ich777/debian-baseimage:bullseye_amd64
 
 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 lib32gcc-s1 winbind xvfb screen cabextract && \
-	wget -q -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks && \
-	chmod +x /usr/bin/winetricks && chown 755 /usr/bin/winetricks && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -34,7 +32,6 @@ RUN mkdir $DATA_DIR && \
 
 ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
-COPY ServerSettings.ini /opt/ServerSettings.ini
 
 #Server Start
 ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,40 +1,36 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Icarus and run it.
+This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
 
-Initial server configuration:  
-**Servername:** Icarus Docker **Password:** Docker  **AdminPassword:** adminDocker  
-
-**ATTENTION:** First startup can take very long since it downloads the gameserver files and it also installs the runtimes which can take quite some time! 
-
-**First Start Notice:** On First startup the container installs the necessary runtimes and it might seem that the container hangs but please be patient since the installation can take very long on some systems (5 minutes+).
-
-Update Notice: Simply restart the container if a newer version of the game is available.
+**Please see the different Tags/Branches which games are available.**
 
 ## 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: '2089300 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2089300 |
-| GAME_PARAMS | Values to start the server | -SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015 |
+| 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_NAME | SRCDS gamename | cstrike |
+| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | false |
+| VALIDATE | Validates the game data | blank |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-## Run example
+## Run example for CS:Source
 ```
-docker run --name Icarus -d \
-	-p 17777:17777/udp -p 27015:27015/udp \
-	--env 'GAME_ID=2089300' \
-	--env 'GAME_PARAMS=-SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015' \
+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' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/icarus:/serverdata/serverfiles \
-	ich777/steamcmd:icarus
+	--volume /path/to/cstrikesource:/serverdata/serverfiles \
+	ich777/steamcmd:latest
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

ServerSettings.ini

@@ -1,13 +0,0 @@
-[/Script/Icarus.DedicatedServerSettings]
-SessionName=Icarus Docker
-JoinPassword=Docker
-MaxPlayers=8
-AdminPassword=adminDocker
-ShutdownIfNotJoinedFor=300.000000
-ShutdownIfEmptyFor=300.000000
-AllowNonAdminsToLaunchProspects=True
-AllowNonAdminsToDeleteProspects=False
-LoadProspect=
-CreateProspect=
-ResumeProspect=True
-LastProspectName=

scripts/start-Xvfb.sh

@@ -1,4 +0,0 @@
-until Xvfb :99 -screen scrn 640x480x16; do
-    echo "Xvfb server crashed with exit code $?.  Respawning.." >&2
-    sleep 1
-done

scripts/start-server.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-export DISPLAY=:99
 if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
     echo "SteamCMD not found!"
     wget -q -O ${STEAMCMD_DIR}/steamcmd_linux.tar.gz http://media.steampowered.com/client/steamcmd_linux.tar.gz 
@@ -23,14 +22,12 @@ if [ "${USERNAME}" == "" ]; then
     if [ "${VALIDATE}" == "true" ]; then
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
         +app_update ${GAME_ID} \
@@ -40,14 +37,12 @@ else
     if [ "${VALIDATE}" == "true" ]; then
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
-        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} \
@@ -56,86 +51,18 @@ else
 fi
 
 echo "---Prepare Server---"
-export WINEARCH=win64
-export WINEPREFIX=/serverdata/serverfiles/WINE64
-echo "---Checking if WINE workdirectory is present---"
-if [ ! -d ${SERVER_DIR}/WINE64 ]; then
-	echo "---WINE workdirectory not found, creating please wait...---"
-    mkdir ${SERVER_DIR}/WINE64
-else
-	echo "---WINE workdirectory found---"
+if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
+	if [ ! -d ${DATA_DIR}/.steam ]; then
+    	mkdir ${DATA_DIR}/.steam
+    fi
+	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
+    	mkdir ${DATA_DIR}/.steam/sdk32
+    fi
+    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
 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
-    wineserver -k >/dev/null 2>&1
-else
-	echo "---WINE properly set up---"
-fi
-
-if [ -f ${SERVER_DIR}/runtimes ]; then
-  rm -f ${SERVER_DIR}/runtimes
-  touch ${SERVER_DIR}/WINE64/runtimes
-fi
-
-echo "---Checking if runtimes are installed---"
-if [ ! -f ${SERVER_DIR}/WINE64/runtimes ]; then
-  echo "---Runtimes not installed, please wait installing...---"
-  mkdir -p ${DATA_DIR}/.cache/winetricks
-  find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
-  /opt/scripts/start-Xvfb.sh 2>/dev/null &
-  echo "---...this can take some time...---"
-  sleep 5
-  timeout 10m /usr/bin/winetricks -q dotnet45 2>/dev/null
-  timeout 3m /usr/bin/winetricks -q vcrun2019 2>/dev/null
-  wine64 ${SERVER_DIR}/IcarusServer.exe -log ${GAME_PARAMS} >/dev/null 2&>1 &
-  sleep 10
-  wineserver -k >/dev/null 2>&1
-  kill $(pidof Xvfb) 2>/dev/null
-  touch ${SERVER_DIR}/WINE64/runtimes
-  echo "---Installation from runtimes finished!---"
-else
-  echo "---Runtimes found! Continuing...---"
-fi
-
-echo "---Looking 'ServerSettings.ini' file is in place---"
-if [ ! -f ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer/ServerSettings.ini ]; then
-  echo "---'ServerSettings.ini' not found, copying template...---"
-  if [ ! -d ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer ]; then
-    mkdir -p ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer
-  fi
-  cp /opt/ServerSettings.ini ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer/
-else
-  echo "---'ServerSettings.ini' found---"
-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 "---Starting Xvfb server---"
-screen -S Xvfb -d -m /opt/scripts/start-Xvfb.sh
-sleep 5
-
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-if [ ! -f ${SERVER_DIR}/IcarusServer.exe ]; then
-  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
-  sleep infinity
-else
-  screen -S Icarus -d -m wine64 ${SERVER_DIR}/IcarusServer.exe -log ${GAME_PARAMS}
-  if [ ! -f ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log ]; then
-    if [ ! -d ${SERVER_DIR}/Icarus/Saved/Logs ]; then
-      mkdir -p ${SERVER_DIR}/Icarus/Saved/Logs
-    fi
-    touch ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log
-  fi
-  sleep 2
-  /opt/scripts/start-watchdog.sh &
-  tail -n 9999 -f ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log
-fi
+${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}

scripts/start-watchdog.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-killpid="$(pidof IcarusServer.exe)"
-while true
-do
-	tail --pid=$killpid -f /dev/null
-	kill "$(pidof tail)"
-exit 0
-done

scripts/start.sh

@@ -22,16 +22,18 @@ fi
 echo "---Taking ownership of data...---"
 chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
-chown ${UID}:${GID} /opt/ServerSettings.ini
-chmod 750 /opt/ServerSettings.ini
 chown -R ${UID}:${GID} ${DATA_DIR}
 
+# Fix for CSDM not working properly
+if [ -f "${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt" ]; then
+  chmod 550 ${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt
+fi
+
 echo "---Starting...---"
 term_handler() {
-	kill -SIGINT $(pidof IcarusServer.exe)
-	tail --pid=$(pidof IcarusServer.exe) -f 2>/dev/null
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
 	exit 143;
-
 }
 
 trap 'kill ${!}; term_handler' SIGTERM

tailscale.sh

@@ -0,0 +1,232 @@
+#!/bin/bash
+# The script will then add the container to your Tailscale network.
+#
+# For more information see: [Link TBD]
+
+error_handler() {
+  echo
+  echo "======================="
+  exit 1
+}
+
+echo "======================="
+echo
+
+# Import variables from s6-overlay images
+if [ -x "/usr/bin/with-contenv" ]; then
+  echo "just-containers s6-overlay image found, importing variables..."
+  ENV_VARS="$(/usr/bin/with-contenv bash -c 'env')"
+
+  while IFS='=' read -r KEY VALUE; do
+    export "${KEY}"="${VALUE}"
+  done <<< "${ENV_VARS}"
+fi
+
+if [[ ! -f /usr/bin/tailscale || ! -f /usr/bin/tailscaled ]]; then
+  if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
+    if [ ! -c /dev/net/tun ]; then
+      echo "ERROR: Device /dev/net/tun not found!"
+      echo "       Make sure to pass through /dev/net/tun to the container."
+      error_handler
+    fi
+    APT_IPTABLES="iptables "
+  fi
+
+  echo "Detecting Package Manager..."
+  if which apt-get >/dev/null 2>&1; then
+    echo "Detected Advanced Package Tool!"
+    PACKAGES_UPDATE="apt-get update"
+    PACKAGES_INSTALL="apt-get -y install --no-install-recommends"
+  elif which apk >/dev/null 2>&1; then
+    echo "Detected Alpine Package Keeper!"
+    PACKAGES_UPDATE="apk update"
+    PACKAGES_INSTALL="apk add"
+  else
+    echo "ERROR: Detection failed!"
+    error_handler
+  fi
+
+  echo "Installing dependencies..."
+  echo "Please wait..."
+  ${PACKAGES_UPDATE} >/dev/null 2>&1
+  ${PACKAGES_INSTALL} jq wget ca-certificates ${APT_IPTABLES}>/dev/null 2>&1
+  echo "Done"
+
+  if [ "${APT_IPTABLES}" == "iptables " ]; then
+    if ! iptables -L >/dev/null 2>&1; then
+      echo "ERROR: Cap: NET_ADMIN not available!"
+      echo "       Make sure to add --cap-add=NET_ADMIN to the Extra Parameters"
+      error_handler
+    fi
+  fi
+
+  echo "Tailscale not found, downloading..."
+  echo "Please wait..."
+
+  TAILSCALE_JSON=$(wget -qO- 'https://pkgs.tailscale.com/stable/?mode=json')
+
+  if [ -z "${TAILSCALE_JSON}" ]; then
+    echo "ERROR: Can't get Tailscale JSON"
+    error_handler
+  fi
+
+  TAILSCALE_TARBALL=$(echo "${TAILSCALE_JSON}" | jq -r .Tarballs.amd64)
+  TAILSCALE_VERSION=$(echo "${TAILSCALE_JSON}" | jq -r .TarballsVersion)
+
+  if [ ! -d /tmp/tailscale ]; then
+    mkdir -p /tmp/tailscale
+  fi
+
+  if wget -q -nc --show-progress --progress=bar:force:noscroll -O /tmp/tailscale/tailscale.tgz "https://pkgs.tailscale.com/stable/${TAILSCALE_TARBALL}" ; then
+    echo "Download from Tailscale version ${TAILSCALE_VERSION} successful!"
+  else
+    echo "ERROR: Download from Tailscale version ${TAILSCALE_VERSION} failed!"
+    rm -rf /tmp/tailscale
+    error_handler
+  fi
+
+  cd /tmp/tailscale
+  tar -xf /tmp/tailscale/tailscale.tgz
+  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscale /usr/bin/tailscale
+  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscaled /usr/bin/tailscaled
+  rm -rf /tmp/tailscale
+
+  echo "Done"
+
+else
+  echo "Tailscale found, continuing..."
+fi
+
+unset TSD_PARAMS
+unset TS_PARAMS
+
+if [ ! -z "${TAILSCALE_STATE_DIR}" ]; then
+  TSD_STATE_DIR="${TAILSCALE_STATE_DIR}"
+elif [ -v SERVER_DIR ]; then
+  TSD_STATE_DIR=${SERVER_DIR}/.tailscale_state
+  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
+elif [ -v DATA_DIR ]; then
+  TSD_STATE_DIR=${DATA_DIR}/.tailscale_state
+  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
+else
+  if [ -z "${TAILSCALE_STATE_DIR}" ]; then
+    TAILSCALE_STATE_DIR="/config/.tailscale_state"
+  fi
+  TSD_STATE_DIR=${TAILSCALE_STATE_DIR}
+  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
+fi
+
+if [ ! -d ${TS_STATE_DIR} ]; then
+  mkdir -p ${TS_STATE_DIR}
+fi
+
+if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
+  echo "Using ${TAILSCALE_EXIT_NODE_IP} as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
+  TS_PARAMS=" --exit-node=${TAILSCALE_EXIT_NODE_IP}"
+  if [ ! -z "${TAILSCALE_ALLOW_LAN_ACCESS}" ]; then
+    echo "Enabling local LAN Access to the container!"
+    TS_PARAMS+=" --exit-node-allow-lan-access"
+  fi
+else
+  if [ -z "${TAILSCALE_USERSPACE_NETWORKING}" ] || [ "${TAILSCALE_USERSPACE_NETWORKING}" == "true" ]; then
+    TSD_PARAMS+="-tun=userspace-networking "
+  else
+    if [ ! -c /dev/net/tun ]; then
+      echo "ERROR: Device /dev/net/tun not found!"
+      echo "       Make sure to pass through /dev/net/tun to the container and add the"
+      echo "       parameter --cap-add=NET_ADMIN to the Extra Parameters!"
+      error_handler
+    fi
+  fi
+fi
+
+if [ "${TAILSCALE_USE_SSH}" == "true" ]; then
+  echo "Enabling SSH. See https://tailscale.com/kb/1193/tailscale-ssh"
+  TS_PARAMS+=" --ssh"
+fi
+
+if [ "${TAILSCALE_LOG}" != "false" ]; then
+  TSD_PARAMS+=">>/var/log/tailscaled 2>&1 "
+  TSD_MSG=" with log file /var/log/tailscaled"
+else
+  TSD_PARAMS+=">/dev/null 2>&1 "
+fi
+
+if [[ ! -z "${TAILSCALE_AUTHKEY}" && -f ${TSD_STATE_DIR}/.initialized ]]; then
+  echo
+  echo "-> It is now save to remove the variable TAILSCALE_AUTHKEY from your template <-"
+  echo
+  unset TAILSCALE_AUTHKEY
+fi
+
+if [ ! -z "${TAILSCALE_AUTHKEY}" ]; then
+  TS_AUTH="--authkey=${TAILSCALE_AUTHKEY} "
+fi
+
+if [ ! -z "${TAILSCALE_HOSTNAME}" ]; then
+  echo "Setting host name to ${TAILSCALE_HOSTNAME}"
+  TS_PARAMS+=" --hostname=${TAILSCALE_HOSTNAME/ /}"
+fi
+
+if [ "${TAILSCALE_EXIT_NODE}" == "true" ]; then
+  echo "Configuring container as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
+  TS_PARAMS+=" --advertise-exit-node"
+fi
+
+if [ ! -z "${TAILSCALED_PARAMS}" ]; then
+  TSD_PARAMS="${TAILSCALED_PARAMS} ${TSD_PARAMS}"
+fi
+
+if [ ! -z "${TAILSCALE_PARAMS}" ]; then
+  TS_PARAMS="${TAILSCALE_PARAMS}${TS_PARAMS}"
+fi
+
+echo "Starting tailscaled${TSD_MSG}"
+eval tailscaled -statedir=${TSD_STATE_DIR} ${TSD_PARAMS}&
+
+echo "Starting tailscale"
+eval tailscale up ${TS_AUTH}${TS_PARAMS}
+EXIT_STATUS="$?"
+
+if [ "${EXIT_STATUS}" == "0" ]; then
+  echo "Connecting to Tailscale successful!"
+  if [ ! -f ${TSD_STATE_DIR}/.initialized ]; then
+    echo "Please don't remove this file!" > ${TSD_STATE_DIR}/.initialized
+  fi
+else
+  echo "ERROR: Connecting to Tailscale not successful!"
+  if [ -f /var/log/tailscaled ]; then
+    echo "Please check the logs:"
+    tail -20 /var/log/tailscaled
+    echo "======================="
+  fi
+  error_handler
+fi
+
+if [[ ! -z "${TAILSCALE_SERVE_PORT}" && "$(tailscale status --json | jq -r '.CurrentTailnet.MagicDNSEnabled')" == "false" ]] ; then
+  echo "ERROR: Enable HTTPS on your Tailscale account to use Tailscale Serve/Funnel."
+  echo "See: https://tailscale.com/kb/1153/enabling-https"
+  error_handler
+fi
+
+if [ ! -z ${TAILSCALE_SERVE_PORT} ]; then
+  if [ ! -z "${TAILSCALE_SERVE_PATH}" ]; then
+    TAILSCALE_SERVE_PATH="=${TAILSCALE_SERVE_PATH}"
+  fi
+  if [ -z "${TAILSCALE_SERVE_MODE}" ]; then
+    TAILSCALE_SERVE_MODE="https"
+  fi
+  if [ -z "${TAILSCALE_SERVE_PROTOCOL_PORT}" ]; then
+    TAILSCALE_SERVE_PROTOCOL_PORT="=443"
+  fi
+  if [ "${TAILSCALE_FUNNEL}" == "true" ]; then
+    echo "Enabling Funnel! See https://tailscale.com/kb/1223/funnel"
+    eval tailscale funnel --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
+  else
+    echo "Enabling Serve! See https://tailscale.com/kb/1312/serve"
+    eval tailscale serve --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
+  fi
+fi
+
+echo
+echo "======================="