Fixes, consistency, box86/box64 support

Author: Greelan

base/debian/Dockerfile

@@ -12,35 +12,71 @@ ENV         LD_LIBRARY_PATH="./:/opt/cubecoders/amp/:/AMP/"
 ARG         DEBIAN_FRONTEND=noninteractive
 ARG         TARGETARCH
 
-# Update base packages and install dependencies, including temp fix if libssl1.1 needed
+# Update base packages and install dependencies
 RUN         set -eux; \
             mkdir -p /usr/share/man/man1; \
             apt-get update; \
             apt-get install -y --no-install-recommends \
-                ca-certificates software-properties-common curl wget tar unzip xz-utils bzip2 \
-                coreutils procps net-tools iproute2 iputils-ping socat jq git git-lfs gnupg lsof tmux sqlite3 gdb \
+                ca-certificates curl wget tar unzip xz-utils bzip2 \
+                coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux sqlite3 dbus \
                 tini tzdata locales \
+                libssl3 libcurl4 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat \
+                # Required for Core Keeper
                 xvfb xauth libxi6 \
-                libc6 libc++-dev libcurl4 libatomic1 libpulse-dev liblua5.3-0 libfontconfig1 libgdiplus libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat; \
-            if [ "$TARGETARCH" = "amd64" ]; then \
-                dpkg --add-architecture i386; \
-                apt-get update; \
-                apt-get install -y --no-install-recommends \
-                    libc6:i386 libstdc++6:i386 libgcc-s1:i386 zlib1g:i386 libbz2-1.0:i386 libzstd1:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
-                    libtinfo6:i386 libncurses6:i386 libncurses5:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libsdl1.2-compat:i386 libssl-dev:i386; \
-            fi; \
+                # Required for Valheim crossplay (and variously some others)
+                libc6 libatomic1 libpulse-dev \
+                # Required for BeamMP
+                liblua5.3-0 \
+                # Required for Eco
+                libgdiplus \
+                # Required for Pavlov VR (and variously some others)
+                gdb libc++-dev; \    
             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) \
+                    dpkg --add-architecture i386; \
+                    apt-get update; \
+                    apt-get install -y --no-install-recommends \
+                        # Required for steamcmd
+                        libgcc-s1:i386 \
+                        # Others
+                        libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
+                        libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl-dev:i386; \
+                    ;; \
+                arm64) \
+                    dpkg --add-architecture armhf; \
+                    apt-get update; \
+                    apt-get install -y --no-install-recommends \
+                        # Required for steamcmd
+                        libgcc-s1:armhf \
+                        # Others
+                        libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4:armhf libcurl3-gnutls:armhf libcurl4-gnutls-dev:armhf \
+                        libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl-dev:armhf; \
+                    # Add box86/box64
+                    install -d -m 0755 /etc/apt/keyrings; \
+                    wget -qO- "https://pi-apps-coders.github.io/box86-debs/KEY.gpg" | gpg --dearmor -o /etc/apt/keyrings/box86-archive-keyring.gpg; \
+                    printf "Types: deb\nURIs: https://Pi-Apps-Coders.github.io/box86-debs/debian\nSuites: ./\nSigned-By: /etc/apt/keyrings/box86-archive-keyring.gpg" | tee /etc/apt/sources.list.d/box86.sources >/dev/null; \
+                    wget -qO- "https://pi-apps-coders.github.io/box64-debs/KEY.gpg" | gpg --dearmor -o /etc/apt/keyrings/box64-archive-keyring.gpg; \
+                    printf "Types: deb\nURIs: https://Pi-Apps-Coders.github.io/box64-debs/debian\nSuites: ./\nSigned-By: /etc/apt/keyrings/box64-archive-keyring.gpg" | tee /etc/apt/sources.list.d/box64.sources >/dev/null; \
+                    apt-get update; \
+                    apt-get install -y \
+                        box86-generic-arm:armhf box64-generic-arm; \
+                    ;; \
+            esac; \
+            # 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;; \
             esac; \
             apt-get install -y --no-install-recommends ./libssl1.1.deb; \
             rm libssl1.1.deb; \
+            # Install AMP instance manager
             case "$TARGETARCH" in \
-                amd64) wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz ;; \
-                arm64) wget -q https://cdn-repo.c7rs.com/aarch64/ampinstmgr-latest.tgz ;; \
+                amd64) wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz;; \
+                arm64) wget -q https://cdn-repo.c7rs.com/aarch64/ampinstmgr-latest.tgz;; \
             esac; \
             tar -xzf ampinstmgr-latest.tgz -C /; \
             rm ampinstmgr-latest.tgz; \
+            # Set up locales
             sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen; \
             locale-gen; \
             apt-get clean; \
@@ -52,5 +88,5 @@ ENV         LC_ALL=en_US.UTF-8
 
 COPY        ./scripts/ampstart.sh /ampstart.sh
 RUN         chmod +x /ampstart.sh
-ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
-CMD         ["/ampstart.sh"]
+ENTRYPOINT  ["/usr/bin/tini", "-g", "--", "/ampstart.sh"]
+CMD         []

java/lts/Dockerfile

@@ -12,8 +12,8 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends fontconfig fonts-dejavu-core; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null; \
-            echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list; \
+            wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg; \
+            echo "deb [signed-by=/etc/apt/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list >/dev/null; \
             apt-get update; \
             apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk; \
             apt-get clean; \

mono/latest/Dockerfile

@@ -13,7 +13,7 @@ RUN         set -eux; \
             apt-get install -y --no-install-recommends dirmngr; \
             install -d -m 0755 /etc/apt/keyrings; \
             gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; \
-            echo "deb [signed-by=/etc/apt/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list; \
+            echo "deb [signed-by=/etc/apt/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list >/dev/null; \
             apt-get update; \
             apt-get install -y mono-complete; \
             apt-get clean; \

scripts/ampstart.sh

@@ -9,6 +9,12 @@ if [ -z "${AMPUSERID}" ]; then
   exit 100
 fi
 
+# 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
+
 #Check if the AMP user already exists
 getent passwd amp &> /dev/null
 

wine/10-stable/Dockerfile

@@ -12,7 +12,7 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
+            wget -qO- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
             wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources; \
             apt-get update; \
             apt-get install -y --install-recommends \

wine/9-stable/Dockerfile

@@ -12,7 +12,7 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
+            wget -qO- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
             wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources; \
             apt-get update; \
             apt-get install -y --install-recommends \

wine/devel/Dockerfile

@@ -12,7 +12,7 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
+            wget -qO- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
             wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources; \
             apt-get update; \
             apt-get install -y --install-recommends winehq-devel; \

wine/stable/Dockerfile

@@ -12,7 +12,7 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
+            wget -qO- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
             wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources; \
             apt-get update; \
             apt-get install -y --install-recommends winehq-stable; \

wine/staging/Dockerfile

@@ -12,7 +12,7 @@ RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3; \
             install -d -m 0755 /etc/apt/keyrings; \
-            wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
+            wget -qO- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -; \
             wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources; \
             apt-get update; \
             apt-get install -y --install-recommends winehq-staging; \