feat: switch to new cs2.sh for launching cs2

* switch to use steam sniper runtime as base
* use cs2.sh to launch cs2

Steam CMD stuff needs spinning out into a new build step or intermediate image.

Author: joedwards32

.github/workflows/docker-image.yml

@@ -15,5 +15,5 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build the Docker image
-      working-directory: ./bookworm
+      working-directory: ./sniper
       run: docker build . --file Dockerfile --tag joedwards32/cs2:latest

.github/workflows/docker-publish.yml

@@ -73,8 +73,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
-          context: ./bookworm
-          file: ./bookworm/Dockerfile
+          context: ./sniper
+          file: ./sniper/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

bookworm/hooks/build

@@ -4,10 +4,16 @@
 
 # BUILD STAGE
 
-FROM cm2network/steamcmd:root-bookworm as build_stage
+FROM registry.gitlab.steamos.cloud/steamrt/sniper/platform as build_stage
 
 LABEL maintainer="[email protected]"
 
+# TODO - Separate stage
+ARG PUID=1000
+ENV USER steam
+ENV HOMEDIR "/home/${USER}"
+ENV STEAMCMDDIR "${HOMEDIR}/steamcmd"
+
 ENV STEAMAPPID 730
 ENV STEAMAPP cs2
 ENV STEAMAPPDIR "${HOMEDIR}/${STEAMAPP}-dedicated"
@@ -29,17 +35,22 @@ RUN set -x \
                 libicu-dev \
                 unzip \
 		jq \
+        && useradd -u "${PUID}" -m "${USER}" \
 	&& mkdir -p "${STEAMAPPDIR}" \
+	&& mkdir -p "${STEAMCMDDIR}" \
 	# Add entry script
 	&& chmod +x "${HOMEDIR}/entry.sh" \
-	&& chown -R "${USER}:${USER}" "${HOMEDIR}/entry.sh" "${STEAMAPPDIR}" \
+	&& chown -R "${USER}:${USER}" "${HOMEDIR}" \
 	# Clean up
         && apt-get clean \
-        && find /var/lib/apt/lists/ -type f -delete
+        && find /var/lib/apt/lists/ -type f -delete \
+        && su "${USER}" -c \
+                "curl -fsSL 'https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz' | tar xvzf - -C \"${STEAMCMDDIR}\" \
+                && \"./${STEAMCMDDIR}/steamcmd.sh\" +quit "\
 
 # BASE
 
-FROM build_stage AS bookworm-base
+FROM build_stage AS sniper-base
 
 ENV CS2_SERVERNAME="cs2 private server" \
     CS2_CHEATS=0 \

bookworm/.dockerignore renamed to sniper/.dockerignore

@@ -55,9 +55,6 @@ fi
 mkdir -p ~/.steam/sdk64
 ln -sfT ${STEAMCMDDIR}/linux64/steamclient.so ~/.steam/sdk64/steamclient.so
 
-# FIX: extend linked library search path to include additional libs provided by valve
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${STEAMAPPDIR}/bin/linuxsteamrt64"
-
 # Install server.cfg
 mkdir -p $STEAMAPPDIR/game/csgo/cfg
 cp /etc/server.cfg "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
@@ -132,7 +129,7 @@ if [[ ! -z $CS2_BOT_QUOTA_MODE ]] ; then
 fi
 
 # Switch to server directory
-cd "${STEAMAPPDIR}/game/bin/linuxsteamrt64"
+cd "${STEAMAPPDIR}/game/"
 
 # Pre Hook
 source "${STEAMAPPDIR}/pre.sh"
@@ -185,7 +182,7 @@ if [[ ! -z $CS2_RCON_PORT ]]; then
 fi
 
 echo "Starting CS2 Dedicated Server"
-eval "./cs2" -dedicated \
+eval "./cs2.sh" -dedicated \
         "${CS2_IP_ARGS}" -port "${CS2_PORT}" \
         -console \
         -usercon \

bookworm/Dockerfile renamed to sniper/Dockerfile

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+ 
+docker build --target=sniper-base -t $DOCKER_REPO:latest -t $DOCKER_REPO:base ${SCRIPT_DIR}/..