| Message ID | 20231121160358.8080-8-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: minor fixes and improvements | expand |
On Tue, 21 Nov 2023, Roger Pau Monne wrote: > Instead of using specific architecture image, switch to using multi-arch ones > and specify the desired architecture using the --platform option. > > 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-arm64v8.dockerfile | 2 +- > automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 2 +- > automation/build/debian/bookworm-arm64v8.dockerfile | 2 +- > automation/build/debian/bookworm-cppcheck.dockerfile | 4 ++-- > automation/build/debian/bookworm-i386.dockerfile | 2 +- > automation/build/debian/stretch-i386.dockerfile | 2 +- > automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 2 +- > automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile | 2 +- > .../qemu-system-aarch64/6.0.0-arm64v8.dockerfile | 2 +- > 9 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile > index 470f5d72a921..91e90220240f 100644 > --- a/automation/build/alpine/3.18-arm64v8.dockerfile > +++ b/automation/build/alpine/3.18-arm64v8.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/alpine:3.18 > +FROM --platform=linux/arm64/v8 alpine:3.18 > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile > index b3295c435ed5..a05ffeac04f9 100644 > --- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile > +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/debian:bookworm > +FROM --platform=linux/arm64/v8 debian:bookworm > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile > index 640b1e0eadf2..2c432aacb765 100644 > --- a/automation/build/debian/bookworm-arm64v8.dockerfile > +++ b/automation/build/debian/bookworm-arm64v8.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/debian:bookworm > +FROM --platform=linux/arm64/v8 debian:bookworm > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile > index d64fb7b18c66..633268376d56 100644 > --- a/automation/build/debian/bookworm-cppcheck.dockerfile > +++ b/automation/build/debian/bookworm-cppcheck.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/debian:bookworm AS builder > +FROM --platform=linux/arm64/v8 debian:bookworm AS builder > > ENV DEBIAN_FRONTEND=noninteractive > ENV CPPCHECK_VERSION=2.7 > @@ -24,7 +24,7 @@ RUN curl -fsSLO https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".t > FILESDIR=/usr/share/cppcheck \ > HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" > > -FROM arm64v8/debian:bookworm > +FROM --platform=linux/arm64/v8 debian:bookworm > COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck > COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck > > diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile > index 559bf670f0f1..89a650338566 100644 > --- a/automation/build/debian/bookworm-i386.dockerfile > +++ b/automation/build/debian/bookworm-i386.dockerfile > @@ -1,4 +1,4 @@ > -FROM i386/debian:bookworm > +FROM --platform=linux/i386 debian:bookworm > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile > index 9739651e25dd..da93fed8ea68 100644 > --- a/automation/build/debian/stretch-i386.dockerfile > +++ b/automation/build/debian/stretch-i386.dockerfile > @@ -1,4 +1,4 @@ > -FROM i386/debian:stretch > +FROM --platform=linux/i386 debian:stretch > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile > index cbd96d9bc6b0..94f69621f40e 100644 > --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile > +++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/alpine:3.18 > +FROM --platform=linux/arm64/v8 alpine:3.18 > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile > index a53a97d7277e..b0875ca0ddd1 100644 > --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile > +++ b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/debian:bookworm > +FROM --platform=linux/arm64/v8 debian:bookworm > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > diff --git a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile > index e277e13b60b9..fb7b7b506e94 100644 > --- a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile > +++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile > @@ -1,4 +1,4 @@ > -FROM arm64v8/debian:bookworm > +FROM --platform=linux/arm64/v8 debian:bookworm > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > -- > 2.42.0 >
diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 470f5d72a921..91e90220240f 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.18 +FROM --platform=linux/arm64/v8 alpine:3.18 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile index b3295c435ed5..a05ffeac04f9 100644 --- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile index 640b1e0eadf2..2c432aacb765 100644 --- a/automation/build/debian/bookworm-arm64v8.dockerfile +++ b/automation/build/debian/bookworm-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile index d64fb7b18c66..633268376d56 100644 --- a/automation/build/debian/bookworm-cppcheck.dockerfile +++ b/automation/build/debian/bookworm-cppcheck.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm AS builder +FROM --platform=linux/arm64/v8 debian:bookworm AS builder ENV DEBIAN_FRONTEND=noninteractive ENV CPPCHECK_VERSION=2.7 @@ -24,7 +24,7 @@ RUN curl -fsSLO https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".t FILESDIR=/usr/share/cppcheck \ HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile index 559bf670f0f1..89a650338566 100644 --- a/automation/build/debian/bookworm-i386.dockerfile +++ b/automation/build/debian/bookworm-i386.dockerfile @@ -1,4 +1,4 @@ -FROM i386/debian:bookworm +FROM --platform=linux/i386 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index 9739651e25dd..da93fed8ea68 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -1,4 +1,4 @@ -FROM i386/debian:stretch +FROM --platform=linux/i386 debian:stretch LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile index cbd96d9bc6b0..94f69621f40e 100644 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.18 +FROM --platform=linux/arm64/v8 alpine:3.18 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile index a53a97d7277e..b0875ca0ddd1 100644 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile index e277e13b60b9..fb7b7b506e94 100644 --- a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile +++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org"
Instead of using specific architecture image, switch to using multi-arch ones and specify the desired architecture using the --platform option. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- I haven't touched the Yocto dockerfile because I'm not sure how it's used. --- automation/build/alpine/3.18-arm64v8.dockerfile | 2 +- automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 2 +- automation/build/debian/bookworm-arm64v8.dockerfile | 2 +- automation/build/debian/bookworm-cppcheck.dockerfile | 4 ++-- automation/build/debian/bookworm-i386.dockerfile | 2 +- automation/build/debian/stretch-i386.dockerfile | 2 +- automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 2 +- automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile | 2 +- .../qemu-system-aarch64/6.0.0-arm64v8.dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-)