|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: set architecture in docker files
commit 3b2ba63994f25aada6059503c52555d6b0658902
Author: Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Tue Nov 21 17:03:57 2023 +0100
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Nov 22 13:37:17 2023 +0000
automation: set architecture in docker files
Pass the desired architecture of the image in the FROM instruction if the
image is possibly multi-platform.
This allows using the x86 Dockerfiles on OS X on arm64 hardware.
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
automation/build/alpine/3.18.dockerfile | 2 +-
automation/build/archlinux/current-riscv64.dockerfile | 2 +-
automation/build/archlinux/current.dockerfile | 2 +-
automation/build/centos/7.dockerfile | 2 +-
automation/build/debian/bookworm.dockerfile | 2 +-
automation/build/debian/bullseye-ppc64le.dockerfile | 2 +-
automation/build/debian/buster-gcc-ibt.dockerfile | 4 ++--
automation/build/debian/jessie.dockerfile | 2 +-
automation/build/debian/stretch.dockerfile | 2 +-
automation/build/fedora/29.dockerfile | 2 +-
automation/build/suse/opensuse-leap.dockerfile | 2 +-
automation/build/suse/opensuse-tumbleweed.dockerfile | 2 +-
automation/build/ubuntu/bionic.dockerfile | 2 +-
automation/build/ubuntu/focal.dockerfile | 2 +-
automation/build/ubuntu/trusty.dockerfile | 2 +-
automation/build/ubuntu/xenial-xilinx.dockerfile | 2 +-
automation/build/ubuntu/xenial.dockerfile | 2 +-
automation/tests-artifacts/alpine/3.18.dockerfile | 2 +-
automation/tests-artifacts/kernel/6.1.19.dockerfile | 2 +-
automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile | 2 +-
20 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/automation/build/alpine/3.18.dockerfile
b/automation/build/alpine/3.18.dockerfile
index 5d2a69a060..4ae9cb5e9e 100644
--- a/automation/build/alpine/3.18.dockerfile
+++ b/automation/build/alpine/3.18.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM --platform=linux/amd64 alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/archlinux/current-riscv64.dockerfile
b/automation/build/archlinux/current-riscv64.dockerfile
index abf8e7bf0b..af75b5c720 100644
--- a/automation/build/archlinux/current-riscv64.dockerfile
+++ b/automation/build/archlinux/current-riscv64.dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux
+FROM --platform=linux/amd64 archlinux
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/archlinux/current.dockerfile
b/automation/build/archlinux/current.dockerfile
index 47e79637a4..d974a1434f 100644
--- a/automation/build/archlinux/current.dockerfile
+++ b/automation/build/archlinux/current.dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux:base-devel
+FROM --platform=linux/amd64 archlinux:base-devel
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/centos/7.dockerfile
b/automation/build/centos/7.dockerfile
index 69dcefb2f0..ab450f0b3a 100644
--- a/automation/build/centos/7.dockerfile
+++ b/automation/build/centos/7.dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM --platform=linux/amd64 centos:7
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/debian/bookworm.dockerfile
b/automation/build/debian/bookworm.dockerfile
index 7aea081c13..459f8e30bd 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM --platform=linux/amd64 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile
b/automation/build/debian/bullseye-ppc64le.dockerfile
index 4de8458445..6fdfb6bc2b 100644
--- a/automation/build/debian/bullseye-ppc64le.dockerfile
+++ b/automation/build/debian/bullseye-ppc64le.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bullseye-slim
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile
b/automation/build/debian/buster-gcc-ibt.dockerfile
index 96ab4fe8a2..6a3e50ef6b 100644
--- a/automation/build/debian/buster-gcc-ibt.dockerfile
+++ b/automation/build/debian/buster-gcc-ibt.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim AS builder
+FROM --platform=linux/amd64 debian:buster-slim AS builder
ENV DEBIAN_FRONTEND=noninteractive
ENV USER root
@@ -41,7 +41,7 @@ RUN ./configure \
RUN make -j`nproc` && make -j`nproc` install
-FROM debian:buster-slim
+FROM --platform=linux/amd64 debian:buster-slim
COPY --from=builder /opt/gcc-11-ibt /opt/gcc-11-ibt
LABEL maintainer.name="The Xen Project" \
diff --git a/automation/build/debian/jessie.dockerfile
b/automation/build/debian/jessie.dockerfile
index 5c71c3e3ea..32fc952fbc 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -1,4 +1,4 @@
-FROM debian/eol:jessie
+FROM --platform=linux/amd64 debian/eol:jessie
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/debian/stretch.dockerfile
b/automation/build/debian/stretch.dockerfile
index 2f1a99f450..e2706a8f35 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM --platform=linux/amd64 debian:stretch
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/fedora/29.dockerfile
b/automation/build/fedora/29.dockerfile
index e55b06a451..42a87ce6c8 100644
--- a/automation/build/fedora/29.dockerfile
+++ b/automation/build/fedora/29.dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM --platform=linux/amd64 fedora:29
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/suse/opensuse-leap.dockerfile
b/automation/build/suse/opensuse-leap.dockerfile
index 7010b71aca..e1ec38a414 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/leap
+FROM --platform=linux/amd64 opensuse/leap
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile
b/automation/build/suse/opensuse-tumbleweed.dockerfile
index 959e1f6939..38f6fda2ff 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/tumbleweed
+FROM --platform=linux/amd64 opensuse/tumbleweed
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/ubuntu/bionic.dockerfile
b/automation/build/ubuntu/bionic.dockerfile
index e15f54431e..77d7f93386 100644
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM --platform=linux/amd64 ubuntu:18.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/ubuntu/focal.dockerfile
b/automation/build/ubuntu/focal.dockerfile
index e3d11194ee..30a9b8e84f 100644
--- a/automation/build/ubuntu/focal.dockerfile
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM --platform=linux/amd64 ubuntu:20.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/ubuntu/trusty.dockerfile
b/automation/build/ubuntu/trusty.dockerfile
index 22e294c20c..0d33578c4e 100644
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM --platform=linux/amd64 ubuntu:14.04
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/ubuntu/xenial-xilinx.dockerfile
b/automation/build/ubuntu/xenial-xilinx.dockerfile
index 5f70871352..49f27b3229 100644
--- a/automation/build/ubuntu/xenial-xilinx.dockerfile
+++ b/automation/build/ubuntu/xenial-xilinx.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM --platform=linux/amd64 ubuntu:16.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/ubuntu/xenial.dockerfile
b/automation/build/ubuntu/xenial.dockerfile
index 2d2ba3e31f..e8035434f8 100644
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM --platform=linux/amd64 ubuntu:16.04
LABEL maintainer.name="The Xen Project " \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile
b/automation/tests-artifacts/alpine/3.18.dockerfile
index 5f521572b8..f1b4a8b7a1 100644
--- a/automation/tests-artifacts/alpine/3.18.dockerfile
+++ b/automation/tests-artifacts/alpine/3.18.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM --platform=linux/amd64 alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile
b/automation/tests-artifacts/kernel/6.1.19.dockerfile
index d5b787c1cb..3a4096780d 100644
--- a/automation/tests-artifacts/kernel/6.1.19.dockerfile
+++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM --platform=linux/amd64 debian:bookworm
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git
a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
index 7376ca46ff..65857147bf 100644
--- a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
+++ b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM --platform=linux/amd64 debian:bullseye-slim
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |