[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH 6/6] automation: switch to multi-platform images when possible
On Thu, 16 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@xxxxxxxxxx> > --- > I haven't touched the Yocto dockerfile because I'm not sure how it's used. We are missing: automation/build/debian/buster-gcc-ibt.dockerfile automation/build/debian/bookworm-cppcheck.dockerfile automation/tests-artifacts/* Aside from that, it is fine. How did you test the updated containers? Have you already pushed them to the registry? > --- > 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 | 2 +- > automation/build/debian/bookworm-i386.dockerfile | 2 +- > automation/build/debian/stretch-i386.dockerfile | 2 +- > 6 files changed, 6 insertions(+), 6 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@xxxxxxxxxxxxxxxxxxxx" > > 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@xxxxxxxxxxxxxxxxxxxx" > > 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@xxxxxxxxxxxxxxxxxxxx" > > diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile > b/automation/build/debian/bookworm-cppcheck.dockerfile > index d64fb7b18c66..d368d69472cb 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 > 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@xxxxxxxxxxxxxxxxxxxx" > > 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@xxxxxxxxxxxxxxxxxxxx" > > -- > 2.42.0 >
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |