From: Stefano Stabellini <sstabellini@kernel.org>
To: Roger Pau Monne <roger.pau@citrix.com>
Cc: xen-devel@lists.xenproject.org,
Doug Goldstein <cardoe@cardoe.com>,
Stefano Stabellini <sstabellini@kernel.org>
Subject: Re: [PATCH v2 6/7] automation: set architecture in docker files
Date: Tue, 21 Nov 2023 17:28:52 -0800 (PST) [thread overview]
Message-ID: <alpine.DEB.2.22.394.2311211728460.2053963@ubuntu-linux-20-04-desktop> (raw)
In-Reply-To: <20231121160358.8080-7-roger.pau@citrix.com>
[-- Attachment #1: Type: text/plain, Size: 11365 bytes --]
On Tue, 21 Nov 2023, Roger Pau Monne wrote:
> 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@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> I haven't touched the Yocto dockerfile because I'm not sure how it's used.
> ---
> 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 +-
> .../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 5d2a69a06010..4ae9cb5e9e30 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@lists.xenproject.org"
>
> diff --git a/automation/build/archlinux/current-riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile
> index abf8e7bf0b88..af75b5c720ce 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@lists.xenproject.org"
>
> diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile
> index 47e79637a4a6..d974a1434fd5 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@lists.xenproject.org"
>
> diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile
> index 69dcefb2f011..ab450f0b3a0e 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@lists.xenproject.org"
>
> diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
> index 7aea081c13a9..459f8e30bdc6 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@lists.xenproject.org"
>
> diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile
> index 4de8458445ae..6fdfb6bc2b40 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@lists.xenproject.org"
>
> diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/buster-gcc-ibt.dockerfile
> index 96ab4fe8a2f1..6a3e50ef6b3f 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 5c71c3e3ea75..32fc952fbc2d 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@lists.xenproject.org"
>
> diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
> index 2f1a99f45017..e2706a8f3589 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@lists.xenproject.org"
>
> diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
> index e55b06a4517e..42a87ce6c84b 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@lists.xenproject.org"
>
> diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
> index 7010b71acaa0..e1ec38a41445 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@lists.xenproject.org"
>
> diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
> index 959e1f6939f0..38f6fda2ff1b 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@lists.xenproject.org"
>
> diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
> index e15f54431efb..77d7f933860c 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@lists.xenproject.org"
>
> diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
> index e3d11194ee2f..30a9b8e84ffe 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@lists.xenproject.org"
>
> diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
> index 22e294c20cac..0d33578c4e1d 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@lists.xenproject.org"
>
> diff --git a/automation/build/ubuntu/xenial-xilinx.dockerfile b/automation/build/ubuntu/xenial-xilinx.dockerfile
> index 5f7087135213..49f27b322995 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@lists.xenproject.org"
>
> diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
> index 2d2ba3e31f63..e8035434f804 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@lists.xenproject.org"
>
> diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile
> index 5f521572b8fb..f1b4a8b7a191 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@lists.xenproject.org"
>
> diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile
> index d5b787c1cbb5..3a4096780d20 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@lists.xenproject.org"
>
> 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 7376ca46ff8e..65857147bf4f 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@lists.xenproject.org"
>
> --
> 2.42.0
>
next prev parent reply other threads:[~2023-11-22 1:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 16:03 [PATCH v2 0/7] automation: minor fixes and improvements Roger Pau Monne
2023-11-21 16:03 ` [PATCH v2 1/7] automation: remove CR characters from serial output Roger Pau Monne
2023-11-21 16:03 ` [PATCH v2 2/7] automation: remove com1= parameter on QEMU smoke tests Roger Pau Monne
2023-11-22 1:23 ` Stefano Stabellini
2023-11-21 16:03 ` [PATCH v2 3/7] automation: add Xen timestamps to all tests Roger Pau Monne
2023-11-21 16:03 ` [PATCH v2 4/7] automation: fix jessie/stretch images to use archive.debian.org apt repos Roger Pau Monne
2023-11-21 16:03 ` [PATCH v2 5/7] automation: update tests to use Debian Bookworm Roger Pau Monne
2023-11-21 16:03 ` [PATCH v2 6/7] automation: set architecture in docker files Roger Pau Monne
2023-11-22 1:28 ` Stefano Stabellini [this message]
2023-11-21 16:03 ` [PATCH v2 7/7] automation: switch to multi-platform images when possible Roger Pau Monne
2023-11-22 1:29 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.22.394.2311211728460.2053963@ubuntu-linux-20-04-desktop \
--to=sstabellini@kernel.org \
--cc=cardoe@cardoe.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.