Merge remote-tracking branch 'origin/main'

Author: dgibbs64

.github/workflows/docker-publish.yml

@@ -31,7 +31,7 @@ jobs:
         run: ./generate-dockerfiles.sh
 
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           # Artifact name
           name: Dockerfiles
@@ -131,7 +131,7 @@ jobs:
             ${{ matrix.shortname }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6.13.0
+        uses: docker/build-push-action@v6.17.0
         with:
           context: .
           file: dockerfiles/Dockerfile.${{ matrix.shortname }}

dockerfiles/Dockerfile.bf1942

@@ -4,15 +4,15 @@
 # https://github.com/GameServerManagers/docker-gameserver
 #
 
-FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-24.04
+FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-22.04
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
 ARG SHORTNAME=bf1942
 ENV GAMESERVER=bf1942server
 
 WORKDIR /app
 
 ## Auto install game server requirements
-RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-24.04.csv |awk -v shortname="bf1942" -F, '$1==shortname {$1=""; print $0}') \
+RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-22.04.csv |awk -v shortname="bf1942" -F, '$1==shortname {$1=""; print $0}') \
   && if [ -n "${depshortname}" ]; then \
   echo "**** Install ${depshortname} ****" \
   && apt-get update \

dockerfiles/Dockerfile.bfv

@@ -4,15 +4,15 @@
 # https://github.com/GameServerManagers/docker-gameserver
 #
 
-FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-24.04
+FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-22.04
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
 ARG SHORTNAME=bfv
 ENV GAMESERVER=bfvserver
 
 WORKDIR /app
 
 ## Auto install game server requirements
-RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-24.04.csv |awk -v shortname="bfv" -F, '$1==shortname {$1=""; print $0}') \
+RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-22.04.csv |awk -v shortname="bfv" -F, '$1==shortname {$1=""; print $0}') \
   && if [ -n "${depshortname}" ]; then \
   echo "**** Install ${depshortname} ****" \
   && apt-get update \

dockerfiles/Dockerfile.vints

@@ -4,15 +4,15 @@
 # https://github.com/GameServerManagers/docker-gameserver
 #
 
-FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-24.04
+FROM ghcr.io/gameservermanagers/linuxgsm:ubuntu-22.04
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
 ARG SHORTNAME=vints
 ENV GAMESERVER=vintsserver
 
 WORKDIR /app
 
 ## Auto install game server requirements
-RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-24.04.csv |awk -v shortname="vints" -F, '$1==shortname {$1=""; print $0}') \
+RUN depshortname=$(curl --connect-timeout 10 -s https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/ubuntu-22.04.csv |awk -v shortname="vints" -F, '$1==shortname {$1=""; print $0}') \
   && if [ -n "${depshortname}" ]; then \
   echo "**** Install ${depshortname} ****" \
   && apt-get update \