From d20c7e314d4f82ee0d3ae20b3eb7f5265ac00060 Mon Sep 17 00:00:00 2001
From: Umberto Raimondi <me@uraimo.com>
Date: Mon, 21 Oct 2024 09:03:27 +0200
Subject: [PATCH] Add explicit platform for all dockerfiles from the main repos

Following reports at least arm64,ppc64le,s390x have been broken.
---
 Dockerfiles/Dockerfile.aarch64.alpine_latest | 2 +-
 Dockerfiles/Dockerfile.aarch64.bookworm      | 2 +-
 Dockerfiles/Dockerfile.aarch64.bullseye      | 2 +-
 Dockerfiles/Dockerfile.aarch64.buster        | 2 +-
 Dockerfiles/Dockerfile.aarch64.fedora_latest | 2 +-
 Dockerfiles/Dockerfile.aarch64.stretch       | 2 +-
 Dockerfiles/Dockerfile.armv7.alpine_latest   | 2 +-
 Dockerfiles/Dockerfile.armv7.bookworm        | 2 +-
 Dockerfiles/Dockerfile.armv7.bullseye        | 2 +-
 Dockerfiles/Dockerfile.armv7.buster          | 2 +-
 Dockerfiles/Dockerfile.armv7.jessie          | 2 +-
 Dockerfiles/Dockerfile.armv7.stretch         | 2 +-
 Dockerfiles/Dockerfile.ppc64le.alpine_latest | 2 +-
 Dockerfiles/Dockerfile.ppc64le.bookworm      | 2 +-
 Dockerfiles/Dockerfile.ppc64le.bullseye      | 2 +-
 Dockerfiles/Dockerfile.ppc64le.buster        | 2 +-
 Dockerfiles/Dockerfile.ppc64le.stretch       | 2 +-
 Dockerfiles/Dockerfile.riscv64.alpine_edge   | 2 +-
 Dockerfiles/Dockerfile.riscv64.alpine_latest | 2 +-
 Dockerfiles/Dockerfile.s390x.alpine_latest   | 2 +-
 Dockerfiles/Dockerfile.s390x.bookworm        | 2 +-
 Dockerfiles/Dockerfile.s390x.bullseye        | 2 +-
 Dockerfiles/Dockerfile.s390x.buster          | 2 +-
 Dockerfiles/Dockerfile.s390x.stretch         | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Dockerfiles/Dockerfile.aarch64.alpine_latest b/Dockerfiles/Dockerfile.aarch64.alpine_latest
index 0af7a7ca..4238037a 100644
--- a/Dockerfiles/Dockerfile.aarch64.alpine_latest
+++ b/Dockerfiles/Dockerfile.aarch64.alpine_latest
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:latest
+FROM --platform=linux/arm64 arm64v8/alpine:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.aarch64.bookworm b/Dockerfiles/Dockerfile.aarch64.bookworm
index 97bac35a..a0a614d7 100644
--- a/Dockerfiles/Dockerfile.aarch64.bookworm
+++ b/Dockerfiles/Dockerfile.aarch64.bookworm
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:bookworm
+FROM --platform=linux/arm64 arm64v8/debian:bookworm
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.aarch64.bullseye b/Dockerfiles/Dockerfile.aarch64.bullseye
index e3511659..4fe4472e 100644
--- a/Dockerfiles/Dockerfile.aarch64.bullseye
+++ b/Dockerfiles/Dockerfile.aarch64.bullseye
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:bullseye
+FROM --platform=linux/arm64 arm64v8/debian:bullseye
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.aarch64.buster b/Dockerfiles/Dockerfile.aarch64.buster
index b0ecf2d5..5850422e 100644
--- a/Dockerfiles/Dockerfile.aarch64.buster
+++ b/Dockerfiles/Dockerfile.aarch64.buster
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:buster
+FROM --platform=linux/arm64 arm64v8/debian:buster
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.aarch64.fedora_latest b/Dockerfiles/Dockerfile.aarch64.fedora_latest
index 4eca0bd7..f7452a0e 100644
--- a/Dockerfiles/Dockerfile.aarch64.fedora_latest
+++ b/Dockerfiles/Dockerfile.aarch64.fedora_latest
@@ -1,4 +1,4 @@
-FROM arm64v8/fedora:latest
+FROM --platform=linux/arm64 arm64v8/fedora:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.aarch64.stretch b/Dockerfiles/Dockerfile.aarch64.stretch
index 914f7e22..1de4baa4 100644
--- a/Dockerfiles/Dockerfile.aarch64.stretch
+++ b/Dockerfiles/Dockerfile.aarch64.stretch
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:stretch
+FROM --platform=linux/arm64 arm64v8/debian:stretch
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.alpine_latest b/Dockerfiles/Dockerfile.armv7.alpine_latest
index c02c2464..50ba39af 100644
--- a/Dockerfiles/Dockerfile.armv7.alpine_latest
+++ b/Dockerfiles/Dockerfile.armv7.alpine_latest
@@ -1,4 +1,4 @@
-FROM arm32v7/alpine:latest
+FROM --platform=linux/arm/v7 arm32v7/alpine:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.bookworm b/Dockerfiles/Dockerfile.armv7.bookworm
index e2b59446..aa3c5702 100644
--- a/Dockerfiles/Dockerfile.armv7.bookworm
+++ b/Dockerfiles/Dockerfile.armv7.bookworm
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:bookworm
+FROM --platform=linux/arm/v7 arm32v7/debian:bookworm
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.bullseye b/Dockerfiles/Dockerfile.armv7.bullseye
index a960c387..e8e64716 100644
--- a/Dockerfiles/Dockerfile.armv7.bullseye
+++ b/Dockerfiles/Dockerfile.armv7.bullseye
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:bullseye
+FROM --platform=linux/arm/v7 arm32v7/debian:bullseye
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.buster b/Dockerfiles/Dockerfile.armv7.buster
index 6b103490..1e858b68 100644
--- a/Dockerfiles/Dockerfile.armv7.buster
+++ b/Dockerfiles/Dockerfile.armv7.buster
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:buster
+FROM --platform=linux/arm/v7 arm32v7/debian:buster
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.jessie b/Dockerfiles/Dockerfile.armv7.jessie
index 72c72326..b9fa4813 100644
--- a/Dockerfiles/Dockerfile.armv7.jessie
+++ b/Dockerfiles/Dockerfile.armv7.jessie
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:jessie
+FROM --platform=linux/arm/v7 arm32v7/debian:jessie
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.armv7.stretch b/Dockerfiles/Dockerfile.armv7.stretch
index f44846ee..ecde7cbc 100644
--- a/Dockerfiles/Dockerfile.armv7.stretch
+++ b/Dockerfiles/Dockerfile.armv7.stretch
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:stretch
+FROM --platform=linux/arm/v7 arm32v7/debian:stretch
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.ppc64le.alpine_latest b/Dockerfiles/Dockerfile.ppc64le.alpine_latest
index aa05b8c4..7a218af0 100644
--- a/Dockerfiles/Dockerfile.ppc64le.alpine_latest
+++ b/Dockerfiles/Dockerfile.ppc64le.alpine_latest
@@ -1,4 +1,4 @@
-FROM ppc64le/alpine:latest
+FROM --platform=linux/ppc64le ppc64le/alpine:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.ppc64le.bookworm b/Dockerfiles/Dockerfile.ppc64le.bookworm
index ede226db..33956549 100644
--- a/Dockerfiles/Dockerfile.ppc64le.bookworm
+++ b/Dockerfiles/Dockerfile.ppc64le.bookworm
@@ -1,4 +1,4 @@
-FROM ppc64le/debian:bookworm
+FROM --platform=linux/ppc64le ppc64le/debian:bookworm
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.ppc64le.bullseye b/Dockerfiles/Dockerfile.ppc64le.bullseye
index 0b386dbd..27006e04 100644
--- a/Dockerfiles/Dockerfile.ppc64le.bullseye
+++ b/Dockerfiles/Dockerfile.ppc64le.bullseye
@@ -1,4 +1,4 @@
-FROM ppc64le/debian:bullseye
+FROM --platform=linux/ppc64le ppc64le/debian:bullseye
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.ppc64le.buster b/Dockerfiles/Dockerfile.ppc64le.buster
index 26a31677..5506b7e0 100644
--- a/Dockerfiles/Dockerfile.ppc64le.buster
+++ b/Dockerfiles/Dockerfile.ppc64le.buster
@@ -1,4 +1,4 @@
-FROM ppc64le/debian:buster
+FROM --platform=linux/ppc64le ppc64le/debian:buster
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.ppc64le.stretch b/Dockerfiles/Dockerfile.ppc64le.stretch
index 9c0b7605..f3fad9ee 100644
--- a/Dockerfiles/Dockerfile.ppc64le.stretch
+++ b/Dockerfiles/Dockerfile.ppc64le.stretch
@@ -1,4 +1,4 @@
-FROM ppc64le/debian:stretch
+FROM --platform=linux/ppc64le ppc64le/debian:stretch
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.riscv64.alpine_edge b/Dockerfiles/Dockerfile.riscv64.alpine_edge
index 0b0c47ea..c362bbde 100644
--- a/Dockerfiles/Dockerfile.riscv64.alpine_edge
+++ b/Dockerfiles/Dockerfile.riscv64.alpine_edge
@@ -1,4 +1,4 @@
-FROM riscv64/alpine:edge
+FROM  --platform=linux/riscv64 riscv64/alpine:edge
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.riscv64.alpine_latest b/Dockerfiles/Dockerfile.riscv64.alpine_latest
index 22bdae72..4dad6d58 100644
--- a/Dockerfiles/Dockerfile.riscv64.alpine_latest
+++ b/Dockerfiles/Dockerfile.riscv64.alpine_latest
@@ -1,4 +1,4 @@
-FROM riscv64/alpine:latest
+FROM  --platform=linux/riscv64 riscv64/alpine:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.s390x.alpine_latest b/Dockerfiles/Dockerfile.s390x.alpine_latest
index f38b19e3..0ce95ca0 100644
--- a/Dockerfiles/Dockerfile.s390x.alpine_latest
+++ b/Dockerfiles/Dockerfile.s390x.alpine_latest
@@ -1,4 +1,4 @@
-FROM s390x/alpine:latest
+FROM --platform=linux/s390x s390x/alpine:latest
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.s390x.bookworm b/Dockerfiles/Dockerfile.s390x.bookworm
index 0c8dba63..70af09b0 100644
--- a/Dockerfiles/Dockerfile.s390x.bookworm
+++ b/Dockerfiles/Dockerfile.s390x.bookworm
@@ -1,4 +1,4 @@
-FROM s390x/debian:bookworm
+FROM --platform=linux/s390x s390x/debian:bookworm
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.s390x.bullseye b/Dockerfiles/Dockerfile.s390x.bullseye
index 356f41a8..8cea725e 100644
--- a/Dockerfiles/Dockerfile.s390x.bullseye
+++ b/Dockerfiles/Dockerfile.s390x.bullseye
@@ -1,4 +1,4 @@
-FROM s390x/debian:bullseye
+FROM --platform=linux/s390x s390x/debian:bullseye
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.s390x.buster b/Dockerfiles/Dockerfile.s390x.buster
index ce95cbde..b874d8bb 100644
--- a/Dockerfiles/Dockerfile.s390x.buster
+++ b/Dockerfiles/Dockerfile.s390x.buster
@@ -1,4 +1,4 @@
-FROM s390x/debian:buster
+FROM --platform=linux/s390x s390x/debian:buster
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
diff --git a/Dockerfiles/Dockerfile.s390x.stretch b/Dockerfiles/Dockerfile.s390x.stretch
index 36c9b9ac..58c3931a 100644
--- a/Dockerfiles/Dockerfile.s390x.stretch
+++ b/Dockerfiles/Dockerfile.s390x.stretch
@@ -1,4 +1,4 @@
-FROM s390x/debian:stretch
+FROM --platform=linux/s390x s390x/debian:stretch
 
 COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
 RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh