Switch to Docker --platform

TheAssassin · TheAssassin · commit 0473babdac7d · 2024-12-13T20:35:01.000+01:00
diff --git a/ci/build-in-docker.sh b/ci/build-in-docker.sh
@@ -28,16 +28,16 @@ this_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 
 case "$ARCH" in
     x86_64)
-        docker_arch=amd64
+        docker_platform=linux/amd64
         ;;
     i386)
-        docker_arch=i386
+        docker_platform=linux/386
         ;;
     armhf)
-        docker_arch=arm32v7
+        docker_platform=linux/arm/v7
         ;;
     aarch64)
-        docker_arch=arm64v8
+        docker_platform=linux/arm64/v8
         ;;
     *)
         echo "Unsupported \$ARCH: $ARCH"
@@ -48,7 +48,7 @@ esac
 # first, we need to build the image
 # we always attempt to build it, it will only be rebuilt if Docker detects changes
 # optionally, we'll pull the base image beforehand
-info "Building Docker image for $ARCH (Docker arch: $docker_arch)"
+info "Building Docker image for $ARCH (Docker platform: $docker_platform)"
 
 build_args=()
 if [[ "${UPDATE:-}" == "" ]]; then
@@ -57,11 +57,11 @@ else
     build_args+=("--pull")
 fi
 
-image_tag="linuxdeploy-build:$ARCH"
+image_tag="linuxdeploy-build"
 
 docker build \
     --build-arg ARCH="$ARCH" \
-    --build-arg docker_arch="$docker_arch" \
+    --platform "$docker_platform" \
     "${build_args[@]}" \
     -t "$image_tag" \
     "$this_dir"/docker
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
@@ -3,14 +3,12 @@
 # needs to be re-run in CI every time as we cannot store auto-built Docker images due to GitHub's strict quota
 # it will save a lot of time in local development environments, though
 
-ARG docker_arch
-
 # we'll just use Debian as a base image for now, mainly because it produces less headache than Ubuntu with arm
 # a big pro is that they ship an up to date CMake in their stable distribution
 # also, they still provide IA-32 builds for some reason...
 # some people in the AppImage community do not (want to) realize i386 is dead for good
 # we are going to drop i686 in the future!
-FROM ${docker_arch}/debian:stable
+FROM debian:stable
 
 # variables that need to be availabe during build and runtime must(!) be repeated after FROM
 ARG ARCH
