Remove numactl & Dockerfile Cleanup (#294)

- Removed the `numactl` package from all images as SteamCMD no longer seems to have issues logging in with a real Steam account (at least on bookworm, which all these images use). The following cleanup changes only apply to Dockerfiles that had `numactl` removed: - Changed all Dockerfiles to use `apt` (instead of `apt-get`) for consistency. - Changed all `apt install` packages to a "list" format for consistency and easier diff reading for future package additions/removals. - Added `locales` to `games\source\Dockerfile` and set the locale. - Moved all instances of the `useradd` command down with the other user and working directory commands. Also added the shell specification flag if it was missing. - Unified all Dockerfiles to use space-indenting and fixed some indent spacing. - Cleaned up some comments.
2025-03-30 02:07:52 -07:00
parent a0c472c743
commit cb724db09c
16 changed files with 311 additions and 106 deletions
--- a/steamcmd/debian/Dockerfile
+++ b/steamcmd/debian/Dockerfile
@@ -8,49 +8,48 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND=noninteractive

 RUN         dpkg --add-architecture i386 \
-            && apt-get update \
-            && apt-get upgrade -y \
-            && apt-get install -y \
-				curl \
-				g++ \
-				gcc \
-				gdb \
-				iproute2 \
-				locales \
-				net-tools \
-				netcat-traditional \
-				numactl \
-				tar \
-				telnet \
-				tini \
-				tzdata \
-				wget \
-				xvfb \
-				lib32gcc-s1 \
-				lib32stdc++6 \
-				lib32tinfo6 \
-				lib32z1 \
-				libcurl3-gnutls:i386 \
-				libcurl4-gnutls-dev:i386 \
-				libcurl4:i386 \
-				libfontconfig1 \
-				libgcc-11-dev \
-				libgcc-12-dev \
-				libncurses5:i386 \
-				libsdl1.2debian \
-				libsdl2-2.0-0 \
-				libsdl2-2.0-0:i386 \
-				libssl-dev:i386 \
-				libtinfo6:i386
+            && apt update \
+            && apt upgrade -y \
+            && apt install -y \
+                curl \
+                g++ \
+                gcc \
+                gdb \
+                iproute2 \
+                locales \
+                net-tools \
+                netcat-traditional \
+                tar \
+                telnet \
+                tini \
+                tzdata \
+                wget \
+                xvfb \
+                lib32gcc-s1 \
+                lib32stdc++6 \
+                lib32tinfo6 \
+                lib32z1 \
+                libcurl3-gnutls:i386 \
+                libcurl4-gnutls-dev:i386 \
+                libcurl4:i386 \
+                libfontconfig1 \
+                libgcc-11-dev \
+                libgcc-12-dev \
+                libncurses5:i386 \
+                libsdl1.2debian \
+                libsdl2-2.0-0 \
+                libsdl2-2.0-0:i386 \
+                libssl-dev:i386 \
+                libtinfo6:i386

-## install rcon
+# Install rcon
 RUN         cd /tmp/ \
            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
            && tar xvf rcon.tar.gz \
            && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/


-			## Temp fix for things that still need libssl1.1
+# Temp fix for things that still need libssl1.1
 RUN         if [ "$(uname -m)" = "x86_64" ]; then \
                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
                dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
@@ -58,21 +57,21 @@ RUN         if [ "$(uname -m)" = "x86_64" ]; then \
            fi

 # Set the locale
-RUN        	sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
-           	locale-gen
-ENV      	LANG=en_US.UTF-8
-ENV       	LANGUAGE=en_US:en
-ENV        	LC_ALL=en_US.UTF-8
+RUN         sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+            locale-gen
+ENV         LANG=en_US.UTF-8
+ENV         LANGUAGE=en_US:en
+ENV         LC_ALL=en_US.UTF-8

-## Setup user and working directory
+# Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

-STOPSIGNAL SIGINT
+STOPSIGNAL  SIGINT

 COPY        --chown=container:container ../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
-ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
 CMD         ["/entrypoint.sh"]
--- a/steamcmd/proton/Dockerfile
+++ b/steamcmd/proton/Dockerfile
@@ -5,12 +5,41 @@ FROM        debian:bookworm-slim

 LABEL       author="Torsten Widmann" maintainer="info@goover.de"

-## install required packages
+# Install required packages
 RUN         dpkg --add-architecture i386
 RUN         apt update
-RUN         apt install -y --no-install-recommends wget iproute2 gnupg2 software-properties-common libntlm0 winbind xvfb xauth libncurses5-dev:i386 libncurses6 dbus libgdiplus lib32gcc-s1
-RUN         apt install -y alsa-tools libpulse0 pulseaudio libpulse-dev libasound2 libao-common gnutls-bin gnupg locales numactl cabextract curl python3 python3-pip python3-setuptools tini file pipx
-RUN         useradd -d /home/container -m container
+RUN         apt install -y --no-install-recommends \
+                wget \
+                iproute2 \
+                gnupg2 \
+                software-properties-common \
+                libntlm0 \
+                winbind \
+                xvfb \
+                xauth \
+                libncurses5-dev:i386 \
+                libncurses6 \
+                dbus \
+                libgdiplus \
+                lib32gcc-s1
+RUN         apt install -y \
+                alsa-tools \
+                libpulse0 \
+                pulseaudio \
+                libpulse-dev \
+                libasound2 \
+                libao-common \
+                gnutls-bin \
+                gnupg \
+                locales \
+                cabextract \
+                curl \
+                python3 \
+                python3-pip \
+                python3-setuptools \
+                tini \
+                file \
+                pipx

 # Download Proton GE
 RUN         curl -sLOJ "$(curl -s https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep .tar.gz)"
@@ -23,24 +52,26 @@ RUN         dbus-uuidgen --ensure=/etc/machine-id
 RUN         rm /var/lib/dbus/machine-id
 RUN         dbus-uuidgen --ensure

-#Setup Protontricks
-RUN        pipx install protontricks
+# Setup Protontricks
+RUN         pipx install protontricks

 # Set up Winetricks
 RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
            && chmod +x /usr/sbin/winetricks

-## install rcon
+# Install rcon
 RUN         cd /tmp/ \
            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
            && tar xvf rcon.tar.gz \
            && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
            
+# Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

-STOPSIGNAL SIGINT
+STOPSIGNAL  SIGINT

 COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
--- a/steamcmd/proton_8/Dockerfile
+++ b/steamcmd/proton_8/Dockerfile
@@ -8,9 +8,38 @@ LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 ## install required packages
 RUN         dpkg --add-architecture i386
 RUN         apt update
-RUN         apt install -y --no-install-recommends wget iproute2 gnupg2 software-properties-common libntlm0 winbind xvfb xauth libncurses5-dev:i386 libncurses6 dbus libgdiplus lib32gcc-s1
-RUN         apt install -y alsa-tools libpulse0 pulseaudio libpulse-dev libasound2 libao-common gnutls-bin gnupg locales numactl cabextract curl python3 python3-pip python3-setuptools tini file pipx
-RUN         useradd -d /home/container -m container
+RUN         apt install -y --no-install-recommends \
+                wget \
+                iproute2 \
+                gnupg2 \
+                software-properties-common \
+                libntlm0 \
+                winbind \
+                xvfb \
+                xauth \
+                libncurses5-dev:i386 \
+                libncurses6 \
+                dbus \
+                libgdiplus \
+                lib32gcc-s1
+RUN         apt install -y \
+                alsa-tools \
+                libpulse0 \
+                pulseaudio \
+                libpulse-dev \
+                libasound2 \
+                libao-common \
+                gnutls-bin \
+                gnupg \
+                locales \
+                cabextract \
+                curl \
+                python3 \
+                python3-pip \
+                python3-setuptools \
+                tini \
+                file \
+                pipx

 # Download Proton GE
 RUN         curl -sLOJ "$(curl -s https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/tags/GE-Proton8-32 | grep browser_download_url | cut -d\" -f4 | egrep .tar.gz)"
@@ -23,24 +52,26 @@ RUN         dbus-uuidgen --ensure=/etc/machine-id
 RUN         rm /var/lib/dbus/machine-id
 RUN         dbus-uuidgen --ensure

-#Setup Protontricks
+# Setup Protontricks
 RUN         pipx install protontricks

 # Set up Winetricks
 RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
            && chmod +x /usr/sbin/winetricks

-## install rcon
+# Install rcon
 RUN         cd /tmp/ \
            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
            && tar xvf rcon.tar.gz \
            && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
            
+# Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

-STOPSIGNAL SIGINT
+STOPSIGNAL  SIGINT

 COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
--- a/steamcmd/sniper/Dockerfile
+++ b/steamcmd/sniper/Dockerfile
@@ -6,24 +6,53 @@ FROM         --platform=$TARGETOS/$TARGETARCH registry.gitlab.steamos.cloud/stea
 LABEL       author="Alexander Ballauf" maintainer="admin@ballaual.de"
 LABEL       org.opencontainers.image.description SteamRT3 Platform image for Pterodactyl Source engine servers. 

-## install required packages
+# Install required packages
 RUN         dpkg --add-architecture i386 \
-            && apt-get update \
-            && apt-get upgrade -y \
-            && apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl xvfb tini libc6 \
-            && useradd -m -d /home/container container
+            && apt update \
+            && apt upgrade -y \
+            && apt install -y \
+                tar \
+                curl \
+                gcc \
+                g++ \
+                lib32gcc-s1 \
+                libgcc1 \
+                libcurl4-gnutls-dev:i386 \
+                libssl1.1:i386 \
+                libcurl4:i386 \
+                lib32tinfo6 \
+                libtinfo6:i386 \
+                lib32z1 \
+                lib32stdc++6 \
+                libncurses5:i386 \
+                libcurl3-gnutls:i386 \
+                libsdl2-2.0-0:i386 \
+                libsdl2-2.0-0 \
+                iproute2 \
+                gdb \
+                libsdl1.2debian \
+                libfontconfig1 \
+                telnet \
+                net-tools \
+                netcat \
+                tzdata \
+                xvfb \
+                tini \
+                libc6

-## install rcon
+# Install rcon
 RUN         cd /tmp/ \
            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
            && tar xvf rcon.tar.gz \
            && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
            
+# Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

-STOPSIGNAL SIGINT
+STOPSIGNAL  SIGINT

 COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh