Multi-arch, other tidies

Author: Greelan

base/ampbase/Dockerfile

@@ -1,34 +1,49 @@
-FROM debian:bookworm-slim
+FROM --platform=$TARGETPLATFORM debian:bookworm-slim
 
 LABEL org.opencontainers.image.source="https://github.com/CubeCoders/dockerfiles"
 LABEL org.opencontainers.image.licenses=MIT
 
-ENV DEBIAN_FRONTEND=noninteractive
 ENV AMP_CONTAINER="DOCKER"
 ENV LD_LIBRARY_PATH="./:/opt/cubecoders/amp/:/AMP/"
 
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+
 # Update base packages and install dependencies
 RUN mkdir -p /usr/share/man/man1 &&\
- dpkg --add-architecture i386 &&\
  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 inetutils-ping socat jq git git-lfs gnupg lsof tmux sqlite3 gdb\
  tini tzdata locales\
  xvfb xauth libxi6\
- libc6 libc++1 libc++abi1 libcurl4 libatomic1 libpulse-dev liblua5.3-0 libfontconfig1 libgdiplus libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2debian libssl-dev\
- libc6:i386 libc++1:i386 libc++abi1:i386 libstdc++6:i386 libgcc-s1:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libtinfo6:i386 libncurses6:i386 libncurses5:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libsdl1.2-compat:i386 libssl-dev:i386 &&\
+ libc6 libc++1 libc++abi1 libcurl4 libatomic1 libpulse-dev liblua5.3-0 libfontconfig1 libgdiplus libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2debian libssl-dev &&\
+ if [ "$TARGETARCH" = "amd64" ]; then\
+ dpkg --add-architecture i386 &&\
+ apt-get update &&\
+ apt-get install -y --no-install-recommends libc6:i386 libc++1:i386 libc++abi1:i386 libstdc++6:i386 libgcc-s1:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libtinfo6:i386\
+ libncurses6:i386 libncurses5:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libsdl1.2-compat:i386 libssl-dev:i386;\
+ fi &&\
  apt-get clean &&\
  rm -rf /var/lib/apt/lists/* &&\
- wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz &&\
- tar -xf ampinstmgr-latest.tgz -C / &&\
+ 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 ;;\
+ esac &&\
+ tar -xzf ampinstmgr-latest.tgz -C / &&\
  rm ampinstmgr-latest.tgz
 
 # Temp fix if libssl1.1 needed
-RUN wget -q http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb &&\
- dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb &&\
- rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb
+RUN 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 update &&\
+ apt-get install -y --no-install-recommends ./libssl1.1.deb &&\
+ rm libssl1.1.deb &&\
+ apt-get clean &&\
+ rm -rf /var/lib/apt/lists/*
 
-# Configure locale
+ # Configure locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen &&\
  locale-gen
 

java/Dockerfile

@@ -1,16 +1,18 @@
 # Java image including all Temurin LTS versions
 
-FROM cubecoders/ampbase:latest
+FROM --platform=$TARGETPLATFORM cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Temurin Java LTS versions
 RUN apt-get update &&\
- apt-get install -y --no-install-recommends fontconfig libfreetype6 fonts-dejavu-core &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 &&\
  apt-get update &&\
- apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-18-jdk temurin-21-jdk &&\
+ apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk &&\
  apt-get clean &&\
  rm -rf /var/lib/apt/lists/*

mono/Dockerfile

@@ -1,16 +1,18 @@
 # Mono image
 
-FROM ghcr.io/cubecoders/ampbase:latest
+FROM --platform=$TARGETPLATFORM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Mono
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends dirmngr &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 &&\
  apt-get update &&\
- apt-get install -y --install-recommends mono-complete &&\
+ apt-get install -y mono-complete &&\
  apt-get clean &&\
  rm -rf /var/lib/apt/lists/*

python/Dockerfile

@@ -1,17 +1,18 @@
 # Python image for Python 3.10, 3.11 and 3.12
 
-FROM python:3.10-slim-bookworm AS py310
-FROM python:3.12-slim-bookworm AS py312
+FROM --platform=$TARGETPLATFORM python:3.10-slim-bookworm AS py310
+FROM --platform=$TARGETPLATFORM python:3.12-slim-bookworm AS py312
 
-FROM ghcr.io/cubecoders/ampbase:latest
+FROM --platform=$TARGETPLATFORM ghcr.io/cubecoders/ampbase:latest
 LABEL org.opencontainers.image.licenses=MIT
 
-ENV DEBIAN_FRONTEND=noninteractive
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # System Python (3.11) from Debian
 RUN apt-get update &&\
- apt-get install -y python3 python3-pip python3-venv &&\
+ apt-get install -y --no-install-recommends python3 python3-pip python3-venv &&\
  apt-get clean &&\
  rm -rf /var/lib/apt/lists/*
 

wine/10/Dockerfile

@@ -4,10 +4,12 @@ FROM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Wine 10 stable
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3 &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources &&\
  apt-get update &&\

wine/9/Dockerfile

@@ -4,10 +4,12 @@ FROM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Wine 9 stable
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3 &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources &&\
  apt-get update &&\

wine/devel/Dockerfile

@@ -4,10 +4,12 @@ FROM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Wine devel
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3 &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources &&\
  apt-get update &&\

wine/stable/Dockerfile

@@ -4,10 +4,12 @@ FROM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Wine stable
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3 &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources &&\
  apt-get update &&\

wine/staging/Dockerfile

@@ -4,10 +4,12 @@ FROM ghcr.io/cubecoders/ampbase:latest
 
 LABEL org.opencontainers.image.licenses=MIT
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install required packages and Wine staging
 RUN apt-get update &&\
  apt-get install -y --no-install-recommends cabextract winbind wine-binfmt python3 &&\
- mkdir -pm755 /etc/apt/keyrings &&\
+ 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 -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources &&\
  apt-get update &&\