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

Greelan · Greelan · commit d81b749da87c · 2025-09-11T12:33:36.000+10:00
diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
@@ -91,6 +91,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -40,6 +40,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -62,6 +62,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
@@ -62,6 +62,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -68,6 +68,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -61,6 +61,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
@@ -98,6 +100,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - run: docker buildx prune -af
+
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/apps/mongodb/Dockerfile b/apps/mongodb/Dockerfile
@@ -0,0 +1,16 @@
+# MongoDB dependencies image for AMP containers
+# cubecoders/ampbase:mongodb
+
+FROM        cubecoders/ampbase:debian
+
+LABEL       org.opencontainers.image.licenses=MIT
+
+ENV         DEBIAN_FRONTEND="noninteractive"
+
+# Install required packages
+RUN         set -eux; \
+            apt-get update; \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
+                libcurl4t64 libgssapi-krb5-2 libldap-common libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit openssl liblzma5; \
+            apt-get clean; \
+            rm -rf /var/lib/apt/lists/*
diff --git a/apps/postgresql/Dockerfile b/apps/postgresql/Dockerfile
@@ -1,4 +1,4 @@
-# PostgreSQL image for AMP containers
+# PostgreSQL dependencies image for AMP containers
 # cubecoders/ampbase:postgresql
 
 FROM        cubecoders/ampbase:debian
@@ -11,6 +11,8 @@ ENV         DEBIAN_FRONTEND="noninteractive"
 RUN         set -eux; \
             apt-get update; \
             apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
-                make build-essential flex bison perl libreadline-dev libicu-dev; \
+                build-essential make tar gzip bzip2 xz-utils \
+                flex bison perl pkg-config libreadline-dev zlib1g-dev libicu-dev \
+                libssl-dev gettext; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
diff --git a/apps/sinusbot/Dockerfile b/apps/sinusbot/Dockerfile
@@ -0,0 +1,16 @@
+# SinusBot dependencies image for AMP containers
+# cubecoders/ampbase:sinusbot
+
+FROM        cubecoders/ampbase:debian
+
+LABEL       org.opencontainers.image.licenses=MIT
+
+ENV         DEBIAN_FRONTEND="noninteractive"
+
+# Install required packages
+RUN         set -eux; \
+            apt-get update; \
+            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; \
+            apt-get clean; \
+            rm -rf /var/lib/apt/lists/*
diff --git a/apps/uptime-kuma-2/Dockerfile b/apps/uptime-kuma-2/Dockerfile
@@ -1,4 +1,4 @@
-# Uptime Kuma 2 image for AMP containers
+# Uptime Kuma 2 dependencies image for AMP containers
 # Based on https://github.com/louislam/uptime-kuma/blob/223cde831f09a49a317bc4e5926cc8a38a6fa3f2/docker/debian-base.dockerfile
 # cubecoders/ampbase:uptime-kuma-2
 
diff --git a/scripts/apps/uptime-kuma-2/ampstart.sh b/scripts/apps/uptime-kuma-2/ampstart.sh
@@ -27,10 +27,10 @@ else
 fi
 
 if id amp &>/dev/null; then
-  usermod -o -u "${AMPUSERID}" -g "${AMPGROUPID}" amp
+  usermod -o -u "${AMPUSERID}" -g amp amp
 else
   useradd -m -d /home/amp -s /bin/bash -c "AMP Process User" \
-    -o -u "${AMPUSERID}" -g "${AMPGROUPID}" amp
+    -o -u "${AMPUSERID}" -g amp amp
 fi
 
 getent group tty >/dev/null && usermod -aG tty amp
diff --git a/scripts/base/ampstart.sh b/scripts/base/ampstart.sh
@@ -27,10 +27,10 @@ else
 fi
 
 if id amp &>/dev/null; then
-  usermod -o -u "${AMPUSERID}" -g "${AMPGROUPID}" amp
+  usermod -o -u "${AMPUSERID}" -g amp amp
 else
   useradd -m -d /home/amp -s /bin/bash -c "AMP Process User" \
-    -o -u "${AMPUSERID}" -g "${AMPGROUPID}" amp
+    -o -u "${AMPUSERID}" -g amp amp
 fi
 
 getent group tty >/dev/null && usermod -aG tty amp
diff --git a/scripts/wine/find-deps.sh b/scripts/wine/find-deps.sh
@@ -23,7 +23,8 @@ STATUS=/tmp/dpkg.status.empty
 
 case "${BUILD}" in
   stable|devel|staging)
-    apt-get -s install -y -o Dir::State::status="$STATUS" -o APT::Install-Recommends=1 "winehq-${BUILD}" \
+    apt-get -s install -y -o Dir::State::status="$STATUS" -o APT::Install-Recommends=1 -o APT::Architectures=amd64 -o APT::Architectures=i386 \
+      "winehq-${BUILD}" \
     | _print_inst
     ;;
 
@@ -44,7 +45,7 @@ case "${BUILD}" in
       exit 2
     fi
 
-    apt-get -s install -y -o Dir::State::status="$STATUS" -o APT::Install-Recommends=1 \
+    apt-get -s install -y -o Dir::State::status="$STATUS" -o APT::Install-Recommends=1 -o APT::Architectures=amd64 -o APT::Architectures=i386 \
       "wine-${WINE_BRANCH}-i386=${WINE_BUILD}" \
       "wine-${WINE_BRANCH}-amd64=${WINE_BUILD}" \
       "wine-${WINE_BRANCH}=${WINE_BUILD}" \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Uptime Kuma 2 image for AMP containers`
	`1`	`+# Uptime Kuma 2 dependencies image for AMP containers`
`2`	`2`	`# Based on https://github.com/louislam/uptime-kuma/blob/223cde831f09a49a317bc4e5926cc8a38a6fa3f2/docker/debian-base.dockerfile`
`3`	`3`	`# cubecoders/ampbase:uptime-kuma-2`
`4`	`4`