Fix build issues and update .circleci config

Author: Max Huebler

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 executors:
   vm:
     machine:
-      image: ubuntu-2204:current
+      image: ubuntu-2404:current
 
 jobs:
   build:
@@ -15,7 +15,8 @@ jobs:
     - run: docker info
     - run: uname -a
       # Register binfmt_misc targets for cross-building
-    - run: docker run --privileged linuxkit/binfmt:af88a591f9cc896a52ce596b9cf7ca26a061ef97
+    - run: docker run --privileged docker.io/linuxkit/binfmt:v1.1.0
+    - run: make SUFFIX=
     - run: make
     - run: docker images
 
@@ -25,7 +26,7 @@ jobs:
     steps:
     - checkout
     - run: docker info
-    - run: docker run --privileged linuxkit/binfmt:af88a591f9cc896a52ce596b9cf7ca26a061ef97
+    - run: docker run --privileged docker.io/linuxkit/binfmt:v1.1.0
     - run: make SUFFIX=
     - run: docker images
     - run: make tag SUFFIX=

build.sh

@@ -18,5 +18,5 @@ set -e
 source vars.sh
 
 for version in "${versions[@]}"; do
-  docker build --build-arg ARCH="${ARCH}" --build-arg TAG="${TAG}" --pull -t "${IMAGE_NAME}:${version}${SUFFIX}" "${version}"
+  docker build --platform "${PLATFORM}" --build-arg ARCH="${ARCH}" --build-arg TAG="${TAG}" --pull -t "${IMAGE_NAME}:${version}${SUFFIX}" "${version}"
 done

glibc/Dockerfile

@@ -1,6 +1,6 @@
 ARG ARCH=""
 ARG TAG="bookworm-slim"
-FROM ${ARCH}debian:${TAG}
+FROM docker.io/debian:${TAG}
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN \
@@ -31,7 +31,7 @@ RUN set -x \
         fi; \
     done
 
-FROM        ${ARCH}busybox:glibc
+FROM        docker.io/${ARCH}busybox:glibc
 MAINTAINER  The Prometheus Authors <prometheus-developers@googlegroups.com>
 
 COPY --from=0 /rootfs /

uclibc/Dockerfile

@@ -1,6 +1,6 @@
 ARG ARCH=""
 ARG TAG="bookworm-slim"
-FROM ${ARCH}debian:${TAG}
+FROM docker.io/${ARCH}debian:${TAG}
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN \
@@ -30,7 +30,7 @@ RUN set -x \
         fi; \
     done
 
-FROM        ${ARCH}busybox:uclibc
+FROM        docker.io/${ARCH}busybox:stable-uclibc
 MAINTAINER  The Prometheus Authors <prometheus-developers@googlegroups.com>
 
 COPY --from=0 /rootfs /

vars.sh

@@ -16,16 +16,32 @@
 [ "$#" -lt 3 ] && echo "Missing args: $0 {IMAGE_NAME} {ARCH} {SUFFIX} {VERSIONS}" && exit 2;
 
 IMAGE_NAME="$1"; shift;
-ARCH="$1"; shift;
+INPUT_ARCH="$1"; shift;
 SUFFIX="$1"; shift;
 TAG="bookworm-slim"
-if [[ "${ARCH}" == "riscv64" ]]; then
-    TAG="sid-slim"
-fi
+PLATFORM="linux/amd64"
 
-if [[ -n "${ARCH}" ]]; then
-  ARCH="${ARCH}/"
-fi
+case "${INPUT_ARCH}" in
+    arm32v7)
+        PLATFORM="linux/arm/v7"
+        ;;
+    arm64v8)
+        PLATFORM="linux/arm64"
+        ;;
+    riscv64)
+        PLATFORM="linux/riscv64"
+        TAG="sid-slim"
+        ;;
+    ppc64le)
+        PLATFORM="linux/ppc64le"
+        ;;
+    s390x)
+        PLATFORM="linux/s390x"
+        ;;
+esac
+
+# We use official images with --platform, so no prefix needed
+ARCH=""
 
 versions=( "$@" )
 if [[ "${#versions[@]}" -eq 0 ]]; then