Merge remote-tracking branch 'upstream/master' into readme

Greelan · Greelan · commit 594f34e6387d · 2025-09-05T13:36:46.000+10:00
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -22,9 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         base:
-          - debian
-          - debian-13
-          - ubuntu
+          - 'debian'
+          - 'debian-12'
+          - 'ubuntu'
 
     steps:
       - uses: actions/checkout@v4
@@ -48,13 +48,14 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.base }}
           provenance: mode=max
           sbom: true
-      
-#      - uses: peter-evans/dockerhub-description@v4
-#        with:
-#          username: ${{ vars.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#          repository: cubecoders/ampbase
-#          short-description: "Images for AMP's Docker instances."
+
+      - uses: peter-evans/dockerhub-description@v4
+        continue-on-error: true
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: cubecoders/ampbase
+          short-description: "Images for AMP's Docker instances."
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         java:
-          - lts
+          - 'lts'
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         mono:
-          - latest
+          - 'latest'
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -80,11 +80,11 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - stable
-          - devel
-          - staging
-          - 10-stable
-          - 9-stable
+          - 'stable'
+          - 'devel'
+          - 'staging'
+          - '10-stable'
+          - '9-stable'
         
     steps:
       - uses: actions/checkout@v4
diff --git a/base/debian-12/Dockerfile b/base/debian-12/Dockerfile
@@ -1,7 +1,7 @@
-# Base Debian 13 image for AMP containers
-# cubecoders/ampbase:debian-13
+# Base Debian 12 image for AMP containers
+# cubecoders/ampbase:debian-12
 
-FROM        debian:trixie-slim
+FROM        debian:bookworm-slim
 
 LABEL       org.opencontainers.image.source="https://github.com/CubeCoders/dockerfiles"
 LABEL       org.opencontainers.image.licenses=MIT
@@ -19,7 +19,7 @@ RUN         set -eux; \
                 ca-certificates curl wget tar unzip xz-utils bzip2 \
                 coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux dbus \
                 tini tzdata locales gosu \
-                libssl3t64 libcurl4t64 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat libfontconfig1 libicu76 \
+                libssl3 libcurl4 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat libfontconfig1 \
                 # Required for Proton
                 python3 \
                 # Required for Core Keeper
@@ -41,8 +41,8 @@ RUN         set -eux; \
                         # Required for steamcmd
                         libgcc-s1:i386 \
                         # Others
-                        libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4t64:i386 libcurl3t64-gnutls:i386 \
-                        libncurses6:i386 libtinfo6:i386 libsdl2-2.0-0:i386 libssl3t64:i386; \
+                        libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libcurl3-gnutls:i386 \
+                        libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl3:i386; \
                     ;; \
                 \
                 arm64) \
@@ -52,8 +52,8 @@ RUN         set -eux; \
                         # Required for steamcmd
                         libgcc-s1:armhf \
                         # Others
-                        libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4t64:armhf libcurl3t64-gnutls:armhf \
-                        libncurses6:armhf libtinfo6:armhf libsdl2-2.0-0:armhf libssl3t64:armhf; \
+                        libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4:armhf libcurl3-gnutls:armhf \
+                        libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl3:armhf; \
                     \
                     # Add box86/box64
                     install -d -m 0755 /etc/apt/keyrings; \
@@ -69,8 +69,8 @@ RUN         set -eux; \
             \
             # Temp fix if libssl1.1 needed
             case "${TARGETARCH}" in \
-                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
-                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
+                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb;; \
+                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_arm64.deb;; \
             esac; \
             apt-get install -y ./libssl1.1.deb; \
             rm libssl1.1.deb; \
@@ -92,6 +92,8 @@ RUN         set -eux; \
 
 ENV         LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
 
+STOPSIGNAL  SIGINT
+
 COPY        ./scripts/base/ampstart.sh /ampstart.sh
 RUN         chmod +x /ampstart.sh
 ENTRYPOINT  ["/usr/bin/tini", "-g", "--", "/ampstart.sh"]
diff --git a/base/debian/Dockerfile b/base/debian/Dockerfile
@@ -1,7 +1,7 @@
-# Base Debian 12 image for AMP containers
+# Base Debian 13 image for AMP containers
 # cubecoders/ampbase:debian
 
-FROM        debian:bookworm-slim
+FROM        debian:trixie-slim
 
 LABEL       org.opencontainers.image.source="https://github.com/CubeCoders/dockerfiles"
 LABEL       org.opencontainers.image.licenses=MIT
@@ -19,7 +19,7 @@ RUN         set -eux; \
                 ca-certificates curl wget tar unzip xz-utils bzip2 \
                 coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux dbus \
                 tini tzdata locales gosu \
-                libssl3 libcurl4 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat libfontconfig1 \
+                libssl3t64 libcurl4t64 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat libfontconfig1 libicu76 \
                 # Required for Proton
                 python3 \
                 # Required for Core Keeper
@@ -41,8 +41,8 @@ RUN         set -eux; \
                         # Required for steamcmd
                         libgcc-s1:i386 \
                         # Others
-                        libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libcurl3-gnutls:i386 \
-                        libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl3:i386; \
+                        libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4t64:i386 libcurl3t64-gnutls:i386 \
+                        libncurses6:i386 libtinfo6:i386 libsdl2-2.0-0:i386 libssl3t64:i386; \
                     ;; \
                 \
                 arm64) \
@@ -52,8 +52,8 @@ RUN         set -eux; \
                         # Required for steamcmd
                         libgcc-s1:armhf \
                         # Others
-                        libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4:armhf libcurl3-gnutls:armhf \
-                        libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl3:armhf; \
+                        libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4t64:armhf libcurl3t64-gnutls:armhf \
+                        libncurses6:armhf libtinfo6:armhf libsdl2-2.0-0:armhf libssl3t64:armhf; \
                     \
                     # Add box86/box64
                     install -d -m 0755 /etc/apt/keyrings; \
@@ -69,8 +69,8 @@ RUN         set -eux; \
             \
             # Temp fix if libssl1.1 needed
             case "${TARGETARCH}" in \
-                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
-                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
+                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb;; \
+                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_arm64.deb;; \
             esac; \
             apt-get install -y ./libssl1.1.deb; \
             rm libssl1.1.deb; \
@@ -92,6 +92,8 @@ RUN         set -eux; \
 
 ENV         LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
 
+STOPSIGNAL  SIGINT
+
 COPY        ./scripts/base/ampstart.sh /ampstart.sh
 RUN         chmod +x /ampstart.sh
 ENTRYPOINT  ["/usr/bin/tini", "-g", "--", "/ampstart.sh"]
diff --git a/base/ubuntu/Dockerfile b/base/ubuntu/Dockerfile
@@ -67,8 +67,8 @@ RUN         set -eux; \
             \
             # Temp fix if libssl1.1 needed
             case "${TARGETARCH}" in \
-                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
-                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
+                amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_amd64.deb;; \
+                arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.24_arm64.deb;; \
             esac; \
             apt-get install -y ./libssl1.1.deb; \
             rm libssl1.1.deb; \
@@ -90,6 +90,8 @@ RUN         set -eux; \
 
 ENV         LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
 
+STOPSIGNAL  SIGINT
+
 COPY        ./scripts/base/ampstart.sh /ampstart.sh
 RUN         chmod +x /ampstart.sh
 ENTRYPOINT  ["/usr/bin/tini", "-g", "--", "/ampstart.sh"]
diff --git a/java/lts/Dockerfile b/java/lts/Dockerfile
@@ -15,7 +15,7 @@ RUN         set -eux; \
                 fontconfig binutils p11-kit; \
             install -d -m 0755 /etc/apt/keyrings; \
             wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg; \
-            printf 'Types: deb\nURIs: https://packages.adoptium.net/artifactory/deb\nSuites: bookworm\nComponents: main\nSigned-By: /etc/apt/keyrings/adoptium.gpg\n' | tee /etc/apt/sources.list.d/adoptium.sources >/dev/null; \
+            printf 'Types: deb\nURIs: https://packages.adoptium.net/artifactory/deb\nSuites: trixie\nComponents: main\nSigned-By: /etc/apt/keyrings/adoptium.gpg\n' | tee /etc/apt/sources.list.d/adoptium.sources >/dev/null; \
             apt-get update; \
             apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
                 temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk; \
diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile
@@ -1,7 +1,7 @@
 # Python image for AMP containers using Python 3.10 from upstream
 # cubecoders/ampbase:python-3.10
 
-FROM        python:3.10-slim-bookworm AS py310
+FROM        python:3.10-slim-trixie AS py310
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/python/3.11/Dockerfile b/python/3.11/Dockerfile
@@ -1,7 +1,7 @@
 # Python image for AMP containers using Python 3.11 from upstream
 # cubecoders/ampbase:python-3.11
 
-FROM        python:3.11-slim-bookworm AS py311
+FROM        python:3.11-slim-trixie AS py311
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/python/3.12/Dockerfile b/python/3.12/Dockerfile
@@ -1,7 +1,7 @@
 # Python image for AMP containers using Python 3.12 from upstream
 # cubecoders/ampbase:python-3.12
 
-FROM        python:3.12-slim-bookworm AS py312
+FROM        python:3.12-slim-trixie AS py312
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/python/3.13/Dockerfile b/python/3.13/Dockerfile
@@ -1,7 +1,7 @@
 # Python image for AMP containers using Python 3.13 from upstream
 # cubecoders/ampbase:python-3.13
 
-FROM        python:3.13-slim-bookworm AS py313
+FROM        python:3.13-slim-trixie AS py313
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/python/3/Dockerfile b/python/3/Dockerfile
@@ -1,7 +1,7 @@
 # Python image for AMP containers including Python 3.10, 3.11 (default), 3.12 and 3.13 from upstream
 # cubecoders/ampbase:python-3
 
-FROM        python:3.10-slim-bookworm AS py310
+FROM        python:3.10-slim-trixie AS py310
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
@@ -13,7 +13,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
             
-FROM        python:3.11-slim-bookworm AS py311
+FROM        python:3.11-slim-trixie AS py311
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
@@ -25,7 +25,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        python:3.12-slim-bookworm AS py312
+FROM        python:3.12-slim-trixie AS py312
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
@@ -37,7 +37,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        python:3.13-slim-bookworm AS py313
+FROM        python:3.13-slim-trixie AS py313
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/scripts/wine/find-deps.sh b/scripts/wine/find-deps.sh
@@ -3,7 +3,7 @@
 set -eu
 
 BUILD="${1:-stable}"
-WINE_DIST="${WINE_DIST:-bookworm}"
+WINE_DIST="${WINE_DIST:-trixie}"
 
 # Helper: print Inst package names (sans wine metas), sorted unique
 _print_inst() {
diff --git a/wine/10-stable/Dockerfile b/wine/10-stable/Dockerfile
@@ -8,7 +8,7 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         TARGETARCH
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCH="stable"
 ARG         WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/"
 ARG         WINE_TARGET="10"
diff --git a/wine/9-stable/Dockerfile b/wine/9-stable/Dockerfile
@@ -8,7 +8,7 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         TARGETARCH
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCH="stable"
 ARG         WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/"
 ARG         WINE_TARGET="9"
diff --git a/wine/common/Dockerfile b/wine/common/Dockerfile
@@ -2,11 +2,11 @@
 # cubecoders/ampbase:wine-common
 
 ARG         DEPSFINDER_PLATFORM=linux/amd64
-FROM        --platform=${DEPSFINDER_PLATFORM} debian:bookworm-slim AS depsfinder
+FROM        --platform=${DEPSFINDER_PLATFORM} debian:trixie-slim AS depsfinder
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCHES="stable devel staging 10-stable 9-stable"
 
 COPY        scripts/wine/find-deps.sh /usr/local/bin/find-deps.sh
@@ -33,7 +33,7 @@ RUN         set -eux; \
                 > /tmp/wine-files/wine-common-deps-amd64.txt; \
             mv /tmp/wine-*-deps-amd64.txt /tmp/wine-files/
 
-FROM        debian:bookworm-slim AS depsmapper
+FROM        debian:trixie-slim AS depsmapper
 
 ENV         DEBIAN_FRONTEND="noninteractive"
 
diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile
@@ -8,7 +8,7 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         TARGETARCH
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCH="devel"
 ARG         WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/"
 
diff --git a/wine/stable/Dockerfile b/wine/stable/Dockerfile
@@ -8,7 +8,7 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         TARGETARCH
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCH="stable"
 ARG         WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/"
 
diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile
@@ -8,7 +8,7 @@ LABEL       org.opencontainers.image.licenses=MIT
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 ARG         TARGETARCH
-ARG         WINE_DIST="bookworm"
+ARG         WINE_DIST="trixie"
 ARG         WINE_BRANCH="staging"
 ARG         WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine-staging/"
 
