tailscale.sh aktualisiert

ensure group is linked correctly

Dockerfile

@@ -1,10 +1,10 @@
-FROM ich777/debian-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 sqlite3 libsqlite3-0 && \
+	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,39 +1,40 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Craftopia and run it.
+This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
 
-Initial Servername: 'Craftopia Docker' Password: '54321'
-
-**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: '1670340 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 1670340 |
-| GAME_PARAMS | Extra parameters to start the server | empty |
+| 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 |
-| VALIDATE | Validates the game data | true |
-| USERNAME | Leave blank for anonymous login | empty |
-| PASSWRD | Leave blank for anonymous login | empty |
+| GAME_PORT | Port the server will be running on | 27015 |
+| 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 Craftopia -d \
-	-p 8787:8787 -p 8787:8787/udp \
-	--env 'GAME_ID=1670340' \
+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/craftopia:/serverdata/serverfiles \
-	ich777/steamcmd:craftopia
+	--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!
 
-
 This Docker is forked from mattieserver, thank you for this wonderfull Docker.
 
-
 #### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

cfg/ServerSetting.ini

@@ -1,88 +0,0 @@
-
-; Game World Data Setting - name, difficulty, gameMode
-; name : world name
-; difficulty ： 0- Easy, 1- Normal(default), 2- Hard, 3- VeryHard
-; gameMode ： 1- NormalWorld(default), 2- CreativeWorld_Build, 3- CreativeWorld_Play
-
-; Server Setting - isUseSteamLobby, port
-; isUseSteamLobby : using steam account to host the server(1- True(not supported) / 0- False)
-; port : used when not using steam lobby function
-; maxPlayerNumber : maximum number of player can join into the server(1 ~ 127)
-; usePassword : using server password(1- True / 0- False)
-; serverPassword : setting server password up to 8 digit number pin
-
-; Graphics Setting - vSyncCount, maxFPS, grassBend, clothSimOption
-; vSyncCount : vertical sync, 0- disable, 1- once per frame  2- per two frame
-; maxFPS : max frames per second, set to -1 for unlimited fps
-; grassBend : enable Grass Bend(1- True / 0- False)
-; ClothSimOption : cloth simulation, 1- animate everybody's, 2- animate nobody's
-
-; Save Setting - autoSaveSec, autoSavePerHour
-; autoSaveSec : autoSavePer ** second, to disable, set to -1
-; autoSavePerHour : enable autoSavePerHour(1- True / 0- False)
-; savePath : relative path base on ServerSetting.ini folder or absolute path
-
-; Creative Mode Setting -
-; quickCraft : crafting without checking item cost(1- True / 0- False)
-; ageLevel : age Level of the game world, effect crafting recipe
-; islandLevel : island level override, effect monster and dungeon level, set to -1 to disable override
-; noDeath : player character would not dead(1- True / 0- False)
-; noDamage : player character would not take damage(1- True / 0- False)
-; noHunger : player character would not be hungry(1- True / 0- False)
-; infinitStamina : player character has infinit stamina(1- True / 0- False)
-; forceDayTime : game world day time override, 0 to 24, set to -1 to disable
-; buildingIgnoreDamage : building would not take damage(1- True / 0- False)
-; noBuild : player can not place new building(1- True / 0- False)
-
-; Creative Mode Player Status Override - apply at gameStart
-; Level : override character level, set to 0 to disable
-; Health : override character health, set to 0 to disable
-; Mana : override character mana, set to 0 to disable
-; Stamina : override character stamia, set to 0 to disable
-; Money : override character money
-; SkillPoint : override character skill point
-; EnchantPoint : override character enchant point
-
-[GameWorld]
-name=Craftopia Docker
-difficulty=1
-gameMode=1
-
-[Host]
-isUseSteamLobby=0
-port=8787
-maxPlayerNumber=7
-usePassword=1
-serverPassword=54321
-
-[Graphics]
-vSyncCount=0
-maxFPS=60
-grassBend=0
-clothSimOption=2
-
-[Save]
-autoSaveSec=300
-autoSavePerHour=1
-savePath=DedicatedServerSave/
-
-[CreativeModeSetting]
-quickCraft=1
-ageLevel=7
-islandLevel=-1
-noDeath=1
-noDamage=1
-noHunger=1
-infinitStamina=1
-forceDayTime=-1
-buildingIgnoreDamage=0
-noBuild=0
-
-[CreativeModePlStatus]
-Level=0
-Health=0
-Mana=0
-Stamina=0
-Money=1000
-SkillPoint=0
-EnchantPoint=0

scripts/start-server.sh

@@ -51,20 +51,18 @@ else
 fi
 
 echo "---Prepare Server---"
-echo "---Looking for config file---"
-if [ ! -f ${SERVER_DIR}/ServerSetting.ini ]; then
-    echo "---'ServerSetting.ini' not found, downloading template---"
-    cd ${SERVER_DIR}
-	if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/craftopia/cfg/ServerSetting.ini ; then
-		echo "---Sucessfully downloaded 'ServerSetting.ini'---"
-	else
-		echo "---Something went wrong, can't download 'ServerSetting.ini', putting server in sleep mode---"
-		sleep infinity
-	fi
+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
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/Craftopia.x86_64 -batchmode -showlogs ${GAME_PARAMS}
+${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}

scripts/start.sh

@@ -24,11 +24,15 @@ 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 -SIGINT $(pidof Craftopia.x86_64)
-	tail --pid=$(pidof Craftopia.x86_64) -f 2>/dev/null
-	sleep 0.5
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
 	exit 143;
 }
 
@@ -39,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 "======================="