Consistency changes

Author: Greelan

base/debian/Dockerfile

@@ -20,7 +20,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 sqlite3 \
                 tini tzdata locales \
-                libcurl4 libfontconfig1 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat \
+                libcurl4 libfontconfig1 libfreetype6 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat \
                 # Required for Core Keeper
                 xvfb xauth libxi6 \
                 # Required for Valheim crossplay (and variously some others)
@@ -31,35 +31,37 @@ RUN         set -eux; \
                 libgdiplus \
                 # Required for Pavlov VR (and variously some others)
                 gdb libc++-dev; \    
-            if [ "$TARGETARCH" = "amd64" ]; then \
-                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; \
-            fi; \
-            if [ "$TARGETARCH" = "arm64" ]; then \
-                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; \
-            fi; \
+            case "$TARGETARCH" in \
+                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;; \

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 >/dev/null; \
+            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; \

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; \