From bc4ab6097075365e50d2b62c4b09c6be528d88d5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Aug 2025 22:06:25 +0000 Subject: [PATCH] chore(docker): update Dockerfiles to remove steam user and set environment variables * Added `USER root` to ensure proper permissions. * Enhanced user removal command with logging for better visibility. * Set `DEBIAN_FRONTEND` environment variable correctly. --- .github/workflows/action-docker-publish.yml | 3 +-- .vscode/settings.json | 3 --- Dockerfile.ubuntu-2004 | 7 ++++++- Dockerfile.ubuntu-2204 | 7 ++++++- Dockerfile.ubuntu-2404 | 6 ++++-- 5 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.github/workflows/action-docker-publish.yml b/.github/workflows/action-docker-publish.yml index f8e88f0..8909dab 100644 --- a/.github/workflows/action-docker-publish.yml +++ b/.github/workflows/action-docker-publish.yml @@ -107,7 +107,6 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-ubuntu-2004: name: Build Ubuntu 20.04 runs-on: ubuntu-latest @@ -175,4 +174,4 @@ jobs: permissions: actions: write steps: - - uses: liskin/gh-workflow-keepalive@v1 \ No newline at end of file + - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 862b25a..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ansible.python.interpreterPath": "/bin/python3" -} diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index b264fca..8f7762c 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -6,8 +6,13 @@ FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-20.04 +USER root + +## Remove steam user from upstream base image if present +RUN if id -u steam >/dev/null 2>&1; then echo "Removing steam user from base image"; userdel -r steam || true; else echo "steam user not present"; fi + LABEL maintainer="LinuxGSM " -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive ENV TERM=xterm ENV LGSM_GITHUBUSER=GameServerManagers ENV LGSM_GITHUBREPO=LinuxGSM diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index 9379e8a..2295769 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -6,8 +6,13 @@ FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-22.04 +USER root + +## Remove steam user from upstream base image if present +RUN if id -u steam >/dev/null 2>&1; then echo "Removing steam user from base image"; userdel -r steam || true; else echo "steam user not present"; fi + LABEL maintainer="LinuxGSM " -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive ENV TERM=xterm ENV LGSM_GITHUBUSER=GameServerManagers ENV LGSM_GITHUBREPO=LinuxGSM diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404 index 5ab8302..2680805 100644 --- a/Dockerfile.ubuntu-2404 +++ b/Dockerfile.ubuntu-2404 @@ -6,11 +6,13 @@ FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-24.04 +USER root + ## Remove steam user from upstream base image if present -RUN if id -u steam >/dev/null 2>&1; then userdel -r steam || true; fi +RUN if id -u steam >/dev/null 2>&1; then echo "Removing steam user from base image"; userdel -r steam || true; else echo "steam user not present"; fi LABEL maintainer="LinuxGSM " -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive ENV TERM=xterm ENV LGSM_GITHUBUSER=GameServerManagers ENV LGSM_GITHUBREPO=LinuxGSM