tailscale.sh aktualisiert

ensure group is linked correctly

Dockerfile

@@ -1,10 +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 --no-install-recommends lib32gcc-s1 lib32stdc++6 xvfb winbind && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 && \
 	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,17 +1,16 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install LambdaWars and run it.
+This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
 
-**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).
+**Please see the different Tags/Branches which games are available.**
-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: '319060 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 319060 |
+| 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 | lambdawars |
+| GAME_NAME | SRCDS gamename | cstrike |
-| GAME_PARAMS | Values to start the server | +maxplayers 8 +map gamelobby |
+| 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 |
@@ -19,21 +18,19 @@ It is recommended to create a dedicated Steam account for dedicated servers so t
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-## Run example
+## Run example for CS:Source
 ```
-docker run --name LambdaWars -d \
+docker run --name CSSource -d \
-	-p 27015:27015/udp -p 27005:27005/udp -p 27020:27020/udp -p 26901:26901/udp -p 27015:27015 \
+	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=319060' \
+	--env 'GAME_ID=232330' \
-	--env 'GAME_NAME=lambdawars' \
+	--env 'GAME_NAME=cstrike' \
 	--env 'GAME_PORT=27015' \
-	--env 'USERNAME=YOURSTEAMUSER' \
+	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
-	--env 'PASSWRD=YOURSTEAMPASSWORD' \
-	--env 'GAME_PARAMS=+maxplayers 8 +map gamelobby' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/lambdawars:/serverdata/serverfiles \
+	--volume /path/to/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:lambdawars
+	ich777/steamcmd:latest
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

scripts/start-server.sh

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

scripts/start.sh

@@ -24,6 +24,11 @@ chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 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 -SIGTERM "$killpid"
@@ -38,4 +43,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done

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 "======================="