From 07a5f31da01c2145dfce1e36acb8da3022258f38 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 19 Jun 2025 16:31:07 +0100 Subject: [PATCH] fix ubuntu 22 and 20 --- Dockerfile.ubuntu-2004 | 7 ++++--- Dockerfile.ubuntu-2204 | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index a2ed47e..d85afd9 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -45,6 +45,7 @@ RUN echo "**** Install Base LinuxGSM Requirements ****" \ distro-info \ file \ git \ + gnupg \ gosu \ gzip \ hostname \ @@ -92,9 +93,6 @@ RUN echo "**** Install Node.js ****" \ # Install GameDig https://docs.linuxgsm.com/requirements/gamedig RUN echo "**** Install GameDig ****" \ && npm install -g gamedig@5 -WORKDIR /app/lgsm \ - wget -N --no-check-certificate "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/package.json" \ - && npm install WORKDIR /app @@ -138,6 +136,9 @@ COPY entrypoint.sh /app/entrypoint.sh COPY entrypoint-user.sh /app/entrypoint-user.sh COPY entrypoint-healthcheck.sh /app/entrypoint-healthcheck.sh +## Ensure entrypoint scripts have execute permissions +RUN chmod +x /app/entrypoint.sh /app/entrypoint-user.sh /app/entrypoint-healthcheck.sh + RUN date > /build-time.txt ENTRYPOINT ["/bin/bash", "./entrypoint.sh"] diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index e8d2225..27763bb 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -53,6 +53,7 @@ RUN echo "**** Install Base LinuxGSM Requirements ****" \ lib32gcc-s1 \ lib32stdc++6 \ netcat \ + pigz \ python3 \ sudo \ tar \ @@ -135,6 +136,9 @@ COPY entrypoint.sh /app/entrypoint.sh COPY entrypoint-user.sh /app/entrypoint-user.sh COPY entrypoint-healthcheck.sh /app/entrypoint-healthcheck.sh +## Ensure entrypoint scripts have execute permissions +RUN chmod +x /app/entrypoint.sh /app/entrypoint-user.sh /app/entrypoint-healthcheck.sh + RUN date > /build-time.txt ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]