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

Greelan · Greelan · commit f09ef2113c98 · 2025-09-22T14:34:21.000+10:00
diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
@@ -38,6 +38,8 @@ jobs:
             uptime_kuma_2_changed:
               - 'apps/uptime-kuma-2/**'
               - 'scripts/apps/uptime-kuma-2/**'
+            sinusbot_changed:
+              - 'apps/sinusbot/**'
             base_changed:
               - 'base/**'
               - 'scripts/base/ampstart.sh'
@@ -48,7 +50,7 @@ jobs:
           set -euo pipefail
           # Default matrix when not a push: build all apps
           if [ "${{ github.event_name }}" != "push" ]; then
-            echo 'apps_json=["postgresql","uptime-kuma-2"]' >> "$GITHUB_OUTPUT"
+            echo 'apps_json=["postgresql","uptime-kuma-2","sinusbot"]' >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
@@ -61,6 +63,7 @@ jobs:
           apps=()
           if [ "${{ steps.filter.outputs.postgresql_changed || 'false' }}" = "true" ]; then apps+=('"postgresql"'); fi
           if [ "${{ steps.filter.outputs.uptime_kuma_2_changed || 'false' }}" = "true" ]; then apps+=('"uptime-kuma-2"'); fi
+          if [ "${{ steps.filter.outputs.sinusbot_changed || 'false' }}" = "true" ]; then apps+=('"sinusbot"'); fi
 
           if [ "${#apps[@]}" -eq 0 ]; then
             echo 'apps_json=[]' >> "$GITHUB_OUTPUT"
@@ -97,12 +100,12 @@ jobs:
         with:
           context: .
           file: ./apps/${{ matrix.app }}/Dockerfile
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: ${{ matrix.app == 'sinusbot' && 'linux/amd64' || 'linux/amd64,linux/arm64/v8' }}
           push: true
           pull: true
           tags: cubecoders/ampbase:${{ matrix.app }}
-          cache-from: type=registry,ref=cubecoders/ampbase:${{ matrix.app }}
-          cache-to: type=inline
+          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.app }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.app }}
           provenance: mode=max
           sbom: true
 
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -48,10 +48,10 @@ jobs:
           file: ./base/${{ matrix.base }}/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
-          tags: |
-            cubecoders/ampbase:${{ matrix.base }}
-          cache-from: type=registry,ref=cubecoders/ampbase:${{ matrix.base }}
-          cache-to: type=inline
+          pull: true
+          tags: cubecoders/ampbase:${{ matrix.base }}
+          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.base }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.base }}
           provenance: mode=max
           sbom: true
 
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -72,8 +72,8 @@ jobs:
           push: true
           pull: true
           tags: cubecoders/ampbase:java-${{ matrix.java }}
-          cache-from: type=registry,ref=cubecoders/ampbase:java-${{ matrix.java }}
-          cache-to: type=inline
+          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.java }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.java }}
           provenance: mode=max
           sbom: true
 
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
@@ -72,8 +72,8 @@ jobs:
           push: true
           pull: true
           tags: cubecoders/ampbase:mono-${{ matrix.mono }}
-          cache-from: type=registry,ref=cubecoders/ampbase:mono-${{ matrix.mono }}
-          cache-to: type=inline
+          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.mono }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.mono }}
           provenance: mode=max
           sbom: true
 
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -78,8 +78,8 @@ jobs:
           push: true
           pull: true
           tags: cubecoders/ampbase:python-${{ matrix.python }}
-          cache-from: type=registry,ref=cubecoders/ampbase:python-${{ matrix.python }}
-          cache-to: type=inline
+          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.python }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.python }}
           provenance: mode=max
           sbom: true
 
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -71,8 +71,8 @@ jobs:
           push: true
           pull: true
           tags: cubecoders/ampbase:wine-common
-          cache-from: type=registry,ref=cubecoders/ampbase:wine-common
-          cache-to: type=inline
+          cache-from: type=gha,scope=${{ github.workflow }}-common
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-common
           provenance: mode=max
           sbom: true
 
@@ -111,9 +111,9 @@ jobs:
           pull: true
           tags: cubecoders/ampbase:wine-${{ matrix.version }}
           cache-from: |
-            type=registry,ref=cubecoders/ampbase:wine-common
-            type=registry,ref=cubecoders/ampbase:wine-${{ matrix.version }}
-          cache-to: type=inline
+            type=gha,scope=${{ github.workflow }}-common
+            type=gha,scope=${{ github.workflow }}-${{ matrix.version }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.version }}
           provenance: mode=max
           sbom: true
 
diff --git a/apps/sinusbot/Dockerfile b/apps/sinusbot/Dockerfile
@@ -10,7 +10,14 @@ ENV         DEBIAN_FRONTEND="noninteractive"
 # Install required packages
 RUN         set -eux; \
             apt-get update; \
+            # Purge PulseAudio libs from base image
+            apt-get purge --auto-remove -y libpulse0 libpulse-mainloop-glib0; \
+            \
             apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
-                x11vnc xvfb libxcursor1 ca-certificates curl bzip2 libnss3 libegl1 x11-xkb-utils libasound2t64 libpci3 libxslt1.1 libxkbcommon0 libxss1 libxcomposite1 libglib2.0-0t64 less; \
+                ca-certificates bzip2 unzip curl python3 procps x11vnc xvfb libxcursor1 libnss3 \
+                libegl1 libasound2t64 libglib2.0-0t64 libxcomposite-dev less jq libevent-2.1-7t64 \
+                libxcb-xinerama0 liblcms2-2 libatomic1 libxcb-icccm4 libxcb-keysyms1 libxcb-randr0 \
+                libxcb-render-util0 libxcb-shape0 libxcb-xkb1 libxkbcommon0 libxkbcommon-x11-0 libpci3 \
+                libxslt1.1 libxcb-image0; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
diff --git a/base/debian-12/Dockerfile b/base/debian-12/Dockerfile
@@ -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 \
+                libssl3 libcurl4 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2debian libfontconfig1 \
                 # Required for Proton
                 python3 \
                 # Required for Core Keeper
diff --git a/base/debian/Dockerfile b/base/debian/Dockerfile
@@ -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 \
+                libssl3t64 libcurl4t64 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2debian libfontconfig1 libicu76 \
                 # Required for Proton
                 python3 \
                 # Required for Core Keeper
diff --git a/base/ubuntu/Dockerfile b/base/ubuntu/Dockerfile
@@ -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 \
+                libssl3t64 libcurl4t64 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2debian libfontconfig1 \
                 # Required for Core Keeper
                 xvfb xauth libxi6 \
                 # Required for Valheim crossplay (and variously some others)
diff --git a/java/lts/Dockerfile b/java/lts/Dockerfile
@@ -18,6 +18,6 @@ RUN         set -eux; \
             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; \
+                temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk temurin-25-jdk; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
diff --git a/scripts/apps/uptime-kuma-2/ampstart.sh b/scripts/apps/uptime-kuma-2/ampstart.sh
@@ -6,14 +6,17 @@ echo "[Info] AMPStart for Docker"
 ARCH=$(uname -m)
 
 # Context check
-[ -z "${AMPUSERID}" ] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
+[[ -z "${AMPUSERID}" ]] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
 
 # Create /etc/machine-id (addresses Proton/dbus issues)
 mkdir -p /var/lib/dbus
 rm -f /etc/machine-id /var/lib/dbus/machine-id
 dbus-uuidgen --ensure=/etc/machine-id
 ln -s /etc/machine-id /var/lib/dbus/machine-id
 
+# Create /tmp/.X11-unix (for Xvfb etc)
+install -d -o root -g root -m 1777 /tmp/.X11-unix
+
 # Set up amp user and group
 : "${AMPUSERID:?AMPUSERID not set}"
 : "${AMPGROUPID:?AMPGROUPID not set}"
@@ -87,15 +90,20 @@ fi
 # Addition for Uptime Kuma 2 (for embedded MariaDB server)
 chown -R amp:amp /var/lib/mysql
 
+# Set XDG_RUNTIME_DIR (stop Wine/Proton whining)
+XDG_RUNTIME_DIR="/run/user/${AMPUSERID}"
+install -d -m 0700 -o amp -g amp "${XDG_RUNTIME_DIR}"
+
 # Handoff
 echo "[Info] Starting AMP..."
 ARGS=$@
 keep_env=(
   HOME=/home/amp
   USER=amp LOGNAME=amp SHELL=/bin/bash
   LANG="${LANG:-en_US.UTF-8}" LANGUAGE="${LANGUAGE:-en_US:en}" LC_ALL="${LC_ALL:-en_US.UTF-8}"
-  PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
   MAIL=/var/mail/amp
+  XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}"
 )
 # Always keep these AMP_ env vars if set
 for v in AMPHOSTPLATFORM AMP_CONTAINER AMP_CONTAINER_HOST_NETWORK AMPMEMORYLIMIT AMPSWAPLIMIT AMPCONTAINERCPUS; do
diff --git a/scripts/base/ampstart.sh b/scripts/base/ampstart.sh
@@ -6,14 +6,17 @@ echo "[Info] AMPStart for Docker"
 ARCH=$(uname -m)
 
 # Context check
-[ -z "${AMPUSERID}" ] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
+[[ -z "${AMPUSERID}" ]] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
 
 # Create /etc/machine-id (addresses Proton/dbus issues)
 mkdir -p /var/lib/dbus
 rm -f /etc/machine-id /var/lib/dbus/machine-id
 dbus-uuidgen --ensure=/etc/machine-id
 ln -s /etc/machine-id /var/lib/dbus/machine-id
 
+# Create /tmp/.X11-unix (for Xvfb etc)
+install -d -o root -g root -m 1777 /tmp/.X11-unix
+
 # Set up amp user and group
 : "${AMPUSERID:?AMPUSERID not set}"
 : "${AMPGROUPID:?AMPGROUPID not set}"
@@ -84,15 +87,20 @@ if [[ -f "/AMP/customstart.sh" ]]; then
   ( set +e; /AMP/customstart.sh; rc=$?; ((rc==0)) || echo "[Warn] customstart.sh exited with $rc; continuing" )
 fi
 
+# Set XDG_RUNTIME_DIR (stop Wine/Proton whining)
+XDG_RUNTIME_DIR="/run/user/${AMPUSERID}"
+install -d -m 0700 -o amp -g amp "${XDG_RUNTIME_DIR}"
+
 # Handoff
 echo "[Info] Starting AMP..."
 ARGS=$@
 keep_env=(
   HOME=/home/amp
   USER=amp LOGNAME=amp SHELL=/bin/bash
   LANG="${LANG:-en_US.UTF-8}" LANGUAGE="${LANGUAGE:-en_US:en}" LC_ALL="${LC_ALL:-en_US.UTF-8}"
-  PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
   MAIL=/var/mail/amp
+  XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}"
 )
 # Always keep these AMP_ env vars if set
 for v in AMPHOSTPLATFORM AMP_CONTAINER AMP_CONTAINER_HOST_NETWORK AMPMEMORYLIMIT AMPSWAPLIMIT AMPCONTAINERCPUS; do
