From patchwork Wed Jul 3 14:19:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13722386 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57496C2BD09 for ; Wed, 3 Jul 2024 14:20:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.753083.1161354 (Exim 4.92) (envelope-from ) id 1sP0qC-0004MS-Ar; Wed, 03 Jul 2024 14:20:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 753083.1161354; Wed, 03 Jul 2024 14:20:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qC-0004MH-6t; Wed, 03 Jul 2024 14:20:12 +0000 Received: by outflank-mailman (input) for mailman id 753083; Wed, 03 Jul 2024 14:20:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qA-00047x-Cx for xen-devel@lists.xenproject.org; Wed, 03 Jul 2024 14:20:10 +0000 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [2a00:1450:4864:20::52c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5a1adb1f-3947-11ef-bbf9-fd08da9f4363; Wed, 03 Jul 2024 16:20:09 +0200 (CEST) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-58b5f7bf3edso1396543a12.0 for ; Wed, 03 Jul 2024 07:20:09 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm7114707a12.34.2024.07.03.07.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 07:20:07 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5a1adb1f-3947-11ef-bbf9-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720016408; x=1720621208; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8Aqdfs/AvdoZx8uAWY1WwixoePkTnNArRhMfydyClSo=; b=ugI+BswBnnzcQeaGasZP37mXqf70D3luqOX9DD0yxVH/fxbDsTgDlBdfEcln5Cz9Gz agrzHygh9DOKp0OIiDzI/zL02bS37rteadH4yOsMEDdd80VSjtgf6YAzhuG9plAq5Yqg PUAvy5npJolQOvh0nq2icdewvmQcDVj3BxVms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720016408; x=1720621208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Aqdfs/AvdoZx8uAWY1WwixoePkTnNArRhMfydyClSo=; b=VYu237ZayrrXTE0/a5IMweLE4PmXLLto/IFRmPGQsnkExT6mTuuX3azTuJMGJXc9/w REsYhAWmkws58j2gpRgVIsozrrypzY4+hwqaJPVKPo2tCRbz9X5s1XZTNcBdkMPPwv39 ++IzQwE6csk3gTJy9g4fJqqXFp6e0Z6KgiE8eypSvBNayAVQjT754sBIAD7Cg6zc98tL l9J1MUT08v3hpV0Pp6Q+ZMoMaMoNcrgeFKGPq2VBnQL/nXpr90ItmMfV/Uj+RjPq0SPv 8LtxS2y9RMiaqx1uzcoV1ilZYhMW/99fetqvB/3OpHy/Rtxfpv2iYxfPBSHbypwL68J+ gNEg== X-Gm-Message-State: AOJu0YxzuURsYMBFmCA2iEFPymxgJkSYDeg8Vx6cpSWu9QeZwGx0wQQv r628koKDHtakLrwn/yIE0ZgOoVi8gIoiYuTFgLvTiCXGf/XhJFvnzKd4HSUmg5v2dzpLjeANJGF lZSw= X-Google-Smtp-Source: AGHT+IG61/F5ONI0k0FJTm+23+yClcR035t48vCY4szzixkKpIusBv5GONFhW4YDklSrdIh6ezZEbQ== X-Received: by 2002:a05:6402:13c2:b0:57d:4f47:d9f7 with SMTP id 4fb4d7f45d1cf-5879c08e17emr11392257a12.0.1720016407812; Wed, 03 Jul 2024 07:20:07 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Doug Goldstein , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Oleksii Kurochko Subject: [PATCH for-4.19 1/4] CI: Formalise the use of heredocs Date: Wed, 3 Jul 2024 15:19:59 +0100 Message-Id: <20240703142002.1662874-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240703142002.1662874-1-andrew.cooper3@citrix.com> References: <20240703142002.1662874-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Commit b5739330d7f4 introduced the use of heredocs in the jessie/stretch dockerfiles. It turns out this was introduced by BuildKit in 2018 along with a standardisation of Dockerfile syntax, and has subsequently been adopted by the docker community. Annotate all dockerfiles with a statement of the syntax in use, and extend README.md details including how to activate BuildKit when it's available but off by default. This allows the containers to be rebuilt following commit a0e29b316363 ("CI: Drop glibc-i386 from the build containers"). Fixes: b5739330d7f4 ("automation: fix jessie/stretch images to use archive.debian.org apt repos") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- CC: Anthony PERARD CC: Stefano Stabellini CC: Doug Goldstein CC: Roger Pau Monné CC: Oleksii Kurochko --- automation/build/README.md | 10 +++++++++- automation/build/alpine/3.18-arm64v8.dockerfile | 1 + automation/build/alpine/3.18.dockerfile | 1 + automation/build/archlinux/current-riscv64.dockerfile | 1 + automation/build/archlinux/current.dockerfile | 1 + automation/build/centos/7.dockerfile | 1 + .../build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 1 + automation/build/debian/bookworm-arm64v8.dockerfile | 1 + automation/build/debian/bookworm-cppcheck.dockerfile | 1 + automation/build/debian/bookworm-i386.dockerfile | 1 + automation/build/debian/bookworm.dockerfile | 1 + automation/build/debian/bullseye-ppc64le.dockerfile | 1 + automation/build/debian/buster-gcc-ibt.dockerfile | 1 + automation/build/debian/jessie-i386.dockerfile | 1 + automation/build/debian/jessie.dockerfile | 1 + automation/build/debian/stretch-i386.dockerfile | 1 + automation/build/debian/stretch.dockerfile | 1 + automation/build/fedora/29.dockerfile | 1 + automation/build/suse/opensuse-leap.dockerfile | 1 + automation/build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/bionic.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + automation/build/ubuntu/trusty.dockerfile | 1 + automation/build/ubuntu/xenial-xilinx.dockerfile | 1 + automation/build/ubuntu/xenial.dockerfile | 1 + automation/build/yocto/yocto.dockerfile.in | 2 ++ .../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 1 + automation/tests-artifacts/alpine/3.18.dockerfile | 1 + .../tests-artifacts/kernel/5.19-arm64v8.dockerfile | 1 + automation/tests-artifacts/kernel/6.1.19.dockerfile | 1 + .../qemu-system-aarch64/6.0.0-arm64v8.dockerfile | 1 + .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 1 + 32 files changed, 41 insertions(+), 1 deletion(-) diff --git a/automation/build/README.md b/automation/build/README.md index 1c040533fdd8..12a2b4af1807 100644 --- a/automation/build/README.md +++ b/automation/build/README.md @@ -81,7 +81,14 @@ Building a container There is a makefile to make this process easier. You should be able to run `make DISTRO/VERSION` to have Docker build the container -for you. If you define the `PUSH` environment variable when running the +for you. + +Xen's dockerfiles use heredocs, which depend on the standardised dockerfile +syntax introduced by [BuiltKit]. This should work by default starting with +docker 23.0, or podman/buildah v1.33. For older versions of docker, it can be +activated with `DOCKER_BUILDKIT=1` in the environment. + +If you define the `PUSH` environment variable when running the former `make` command, it will push the container to the [registry] if you have access to do so and have your Docker logged into the registry. @@ -101,6 +108,7 @@ env CONTAINER_NO_PULL=1 \ make -C automation/build suse/opensuse-tumbleweed PUSH=1 ``` +[BuildKit]: https://docs.docker.com/build/buildkit/ [registry]: https://gitlab.com/xen-project/xen/container_registry [registry help]: https://gitlab.com/help/user/project/container_registry diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 91e90220240f..19fe46f8418f 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile index 8d5dac05b01f..263e9e90d888 100644 --- a/automation/build/alpine/3.18.dockerfile +++ b/automation/build/alpine/3.18.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 af75b5c720ce..f7770bf82a78 100644 --- a/automation/build/archlinux/current-riscv64.dockerfile +++ b/automation/build/archlinux/current-riscv64.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 d29f1358c2bd..8929e9b5f022 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 1cdc16fc05f9..657550f308bb 100644 --- a/automation/build/centos/7.dockerfile +++ b/automation/build/centos/7.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile index a05ffeac04f9..95b3f0428372 100644 --- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 2c432aacb765..3ab426a082d3 100644 --- a/automation/build/debian/bookworm-arm64v8.dockerfile +++ b/automation/build/debian/bookworm-arm64v8.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 633268376d56..fe4cd4a1aaab 100644 --- a/automation/build/debian/bookworm-cppcheck.dockerfile +++ b/automation/build/debian/bookworm-cppcheck.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM --platform=linux/arm64/v8 debian:bookworm AS builder ENV DEBIAN_FRONTEND=noninteractive diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile index 89a650338566..9a54bd7293dc 100644 --- a/automation/build/debian/bookworm-i386.dockerfile +++ b/automation/build/debian/bookworm-i386.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index d893218fc4bd..bef44dd75300 100644 --- a/automation/build/debian/bookworm.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 6fdfb6bc2b40..e166d205f38c 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 6a3e50ef6b3f..ed9367aafbec 100644 --- a/automation/build/debian/buster-gcc-ibt.dockerfile +++ b/automation/build/debian/buster-gcc-ibt.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM --platform=linux/amd64 debian:buster-slim AS builder ENV DEBIAN_FRONTEND=noninteractive diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile index a8dec82bb299..f6eaa94ee523 100644 --- a/automation/build/debian/jessie-i386.dockerfile +++ b/automation/build/debian/jessie-i386.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM --platform=linux/i386 debian/eol:jessie LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile index 308675cac150..a870e743fcaf 100644 --- a/automation/build/debian/jessie.dockerfile +++ b/automation/build/debian/jessie.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index da93fed8ea68..ad8db692aaf2 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM --platform=linux/i386 debian:stretch 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 59794ed4677b..4dfd40b54277 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 f473ae13e7c1..08edf70838f9 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 3ef33458a07c..28d333881233 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 a793601c876d..077fed22260c 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 910d3c4b5315..cc43fc4ade12 100644 --- a/automation/build/ubuntu/bionic.dockerfile +++ b/automation/build/ubuntu/bionic.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 078abd56d56f..cb8bb2f6faee 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 8bd8c085a781..e2a1bda7c3a8 100644 --- a/automation/build/ubuntu/trusty.dockerfile +++ b/automation/build/ubuntu/trusty.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 49f27b322995..f03d62e8bd3f 100644 --- a/automation/build/ubuntu/xenial-xilinx.dockerfile +++ b/automation/build/ubuntu/xenial-xilinx.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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 f6296d32925c..168bc70ffad8 100644 --- a/automation/build/ubuntu/xenial.dockerfile +++ b/automation/build/ubuntu/xenial.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/yocto/yocto.dockerfile.in b/automation/build/yocto/yocto.dockerfile.in index b0892d420377..fbaa4e191caa 100644 --- a/automation/build/yocto/yocto.dockerfile.in +++ b/automation/build/yocto/yocto.dockerfile.in @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + # Docker file to create an environment to build yocto with virtualization # # Arguments that can be passed during image creation using --build-arg: diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile index 0e5ae7f2b4d8..a4542f703997 100644 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile index 9cde6c9ad4da..311a92889b87 100644 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ b/automation/tests-artifacts/alpine/3.18.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile index b0875ca0ddd1..22359c906630 100644 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile index 021bde26c790..5cf53d290c6f 100644 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 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-aarch64/6.0.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile index fb7b7b506e94..e9f5576be7a6 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,3 +1,4 @@ +# syntax=docker/dockerfile:1 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-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile index 65857147bf4f..e28d68649239 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,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM --platform=linux/amd64 debian:bullseye-slim LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" From patchwork Wed Jul 3 14:20:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13722385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22096C30653 for ; Wed, 3 Jul 2024 14:20:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.753084.1161359 (Exim 4.92) (envelope-from ) id 1sP0qC-0004PJ-LJ; Wed, 03 Jul 2024 14:20:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 753084.1161359; Wed, 03 Jul 2024 14:20:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qC-0004NU-Dj; Wed, 03 Jul 2024 14:20:12 +0000 Received: by outflank-mailman (input) for mailman id 753084; Wed, 03 Jul 2024 14:20:11 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qB-00047x-2S for xen-devel@lists.xenproject.org; Wed, 03 Jul 2024 14:20:11 +0000 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [2a00:1450:4864:20::531]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5a70b626-3947-11ef-bbf9-fd08da9f4363; Wed, 03 Jul 2024 16:20:09 +0200 (CEST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-57cc30eaf0aso1869514a12.2 for ; Wed, 03 Jul 2024 07:20:09 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm7114707a12.34.2024.07.03.07.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 07:20:08 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5a70b626-3947-11ef-bbf9-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720016408; x=1720621208; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QvtNDTqYHADux5W5ocofKnMkBGfiU5QPPfJXj51wIBM=; b=drRurYpwNJGU6MJwYl6R5wMUD9WD7/Vh0m5hYhEArAyEU7VCitn54X8CN4evLigLd+ e9Qmetaa/rys/BaIIbOGfn6Pg/TLX6pmvDxWJa8Mbtiip608nG45Suomk07kDqbmF/Dp IFTi1npCjdyOREi1tnziGuu+Qf7KdL4CXdzgo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720016408; x=1720621208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QvtNDTqYHADux5W5ocofKnMkBGfiU5QPPfJXj51wIBM=; b=qfsd/oAHfilIKvk4QPox1bmEu3cFWQa4XdLdtsXQL7N51mSYCubCEZd0sT7caKY1qw 3u+O0a3QVkeYm+XA7JYKimzhkS1IO0XH54kao+FpdutkwaFKoeULiPESGbBoGvDaylU1 2ljDP7tAys6h7BOCfZE8I7Pw/AplDGceDr3Bq9oPWmBd+41jny2pJQ8pRitWR7kiYUib pIOTtVoAADTzn6bpJGYcTrONUW95UUXd6EFtog7PEpzyLBeB8ugLKW7S1HHM7Eo8tP2B 9yiiqfUKBSVuucOGFb/IGky9M2V097EoOu0y8nnZyCa/DGISrFSsuLnHTtM8PZ/4qsOQ 378g== X-Gm-Message-State: AOJu0YwXnJVYj+UDNCgR9liARUgrlS16ipWtmjFHbNyRqT2wI7JnPV9X GFw9a/NXevQvT7CPAwm3bNzzBohHmlGFqW7rBqT8c5gxf9NT1XWKOuFynsZfJDStPJ0O9slmqjq 3H64= X-Google-Smtp-Source: AGHT+IFqmUSdJZCkTH4i1WdxPdXjaDXOvrWfDnUPTz+/TvaNRmkBILQn52UweyaMVG0TeClF2LUWeQ== X-Received: by 2002:a05:6402:5203:b0:57d:1696:fd14 with SMTP id 4fb4d7f45d1cf-5879ede2704mr11274311a12.8.1720016408500; Wed, 03 Jul 2024 07:20:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Doug Goldstein , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Oleksii Kurochko Subject: [PATCH for-4.19 2/4] CI: Adjust the usage of inline files Date: Wed, 3 Jul 2024 15:20:00 +0100 Message-Id: <20240703142002.1662874-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240703142002.1662874-1-andrew.cooper3@citrix.com> References: <20240703142002.1662874-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 As per: https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/reference.md#here-documents For inline files, use COPY with a heredoc, rather than opencoding it through /bin/sh. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- CC: Anthony PERARD CC: Stefano Stabellini CC: Doug Goldstein CC: Roger Pau Monné CC: Oleksii Kurochko --- automation/build/debian/jessie-i386.dockerfile | 2 +- automation/build/debian/jessie.dockerfile | 2 +- automation/build/debian/stretch-i386.dockerfile | 2 +- automation/build/debian/stretch.dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile index f6eaa94ee523..1eb7ff11c7d3 100644 --- a/automation/build/debian/jessie-i386.dockerfile +++ b/automation/build/debian/jessie-i386.dockerfile @@ -12,7 +12,7 @@ WORKDIR /build ENTRYPOINT ["linux32"] # replace repos in archive as release is EOL -RUN cat <<"END" > /etc/apt/sources.list +COPY <<"END" /etc/apt/sources.list deb http://archive.debian.org/debian/ jessie main contrib non-free deb http://archive.debian.org/debian/ jessie-backports main contrib non-free deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile index a870e743fcaf..4c0ffe66f8fe 100644 --- a/automation/build/debian/jessie.dockerfile +++ b/automation/build/debian/jessie.dockerfile @@ -10,7 +10,7 @@ RUN mkdir /build WORKDIR /build # replace repos in archive as release is EOL -RUN cat <<"END" > /etc/apt/sources.list +COPY <<"END" /etc/apt/sources.list deb http://archive.debian.org/debian/ jessie main contrib non-free deb http://archive.debian.org/debian/ jessie-backports main contrib non-free deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index ad8db692aaf2..8ec9c3a24667 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -12,7 +12,7 @@ WORKDIR /build ENTRYPOINT ["linux32"] # replace repos in archive as release is EOL -RUN cat <<"END" > /etc/apt/sources.list +COPY <<"END" /etc/apt/sources.list deb http://archive.debian.org/debian/ stretch main contrib non-free deb http://archive.debian.org/debian/ stretch-backports main contrib non-free deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index 4dfd40b54277..2db4552662de 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -10,7 +10,7 @@ RUN mkdir /build WORKDIR /build # replace repos in archive as release is EOL -RUN cat <<"END" > /etc/apt/sources.list +COPY <<"END" /etc/apt/sources.list deb http://archive.debian.org/debian/ stretch main contrib non-free deb http://archive.debian.org/debian/ stretch-backports main contrib non-free deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free From patchwork Wed Jul 3 14:20:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13722387 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 283A1C41513 for ; Wed, 3 Jul 2024 14:20:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.753085.1161366 (Exim 4.92) (envelope-from ) id 1sP0qD-0004Zz-2Z; Wed, 03 Jul 2024 14:20:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 753085.1161366; Wed, 03 Jul 2024 14:20:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qC-0004XD-ST; Wed, 03 Jul 2024 14:20:12 +0000 Received: by outflank-mailman (input) for mailman id 753085; Wed, 03 Jul 2024 14:20:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qC-00047s-6p for xen-devel@lists.xenproject.org; Wed, 03 Jul 2024 14:20:12 +0000 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [2a00:1450:4864:20::22a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5b1b7683-3947-11ef-8776-851b0ebba9a2; Wed, 03 Jul 2024 16:20:10 +0200 (CEST) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2ee794ec014so18165041fa.0 for ; Wed, 03 Jul 2024 07:20:10 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm7114707a12.34.2024.07.03.07.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 07:20:09 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b1b7683-3947-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720016410; x=1720621210; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lb9zIjpdzbIG9uZJrlfskajIoTEnVCNUYPBFJFnVoHw=; b=Eq2I9+5S6b/o8YLmnrpE/mFHaWay0QXxFLOkEZoIj+7mNONp/okVDm8NTCoXhDGsi4 ESfdLSP1c2CIcjz43/CiKUdVBeBfvsmRT0Lfhu3hdGDb//SIy65xwZ2NL6Ta03troPxS F6wcmTcthFZj83g88+lTPZ4za1RS7ccQYdouE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720016410; x=1720621210; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lb9zIjpdzbIG9uZJrlfskajIoTEnVCNUYPBFJFnVoHw=; b=m+bHlj9U8jm9vNP3nTmhoqBgTYq6oAnph2CAg1MBagZ6QjhLZuTBPJ79dh8QuYTCjb HTWfcZdpHUZDkRfe4nzu6yEmO1JBbrkAgzrl8qHENJHP7Gg9YiRH36PysBSuq1O1Nfv3 qLOoaYJfBRr4mrsDx+OShL90n9KWZy9RRnGQlpi1UQz63spzh1FfrdQXnlMYROIDdNoy nQUP4DCS+D749AVVzAviU87ea4W7mY+DdEoU+D57jBOjbSgOrgLl/stH06dHO9Xm8BUM X+XrKVKiaC/44EvzjIb2OcTrZMf0B/Yad8menR8RK0tsZzYkI5bhxs/EaoNyXsKndD98 VWnA== X-Gm-Message-State: AOJu0YyswT6h+PT/iS6WQN8tN2ax2Vciup662vdz4VX5Sd+wfTGnfP0G DdDieFUOUbrEvNdnyZixXei5l98CU9xt2UCswQ15C4M/N7zi4ylaLHEQ9WF/hRZ7fkDsn9X+4xV ZF+0= X-Google-Smtp-Source: AGHT+IGoVb58lDyzwPW1lCAVOWyXOeRtDEU7EFwWe6dpZNqkqMntE/OoIykqSAbrcBDP9D8uDC1Jzw== X-Received: by 2002:a05:6512:282c:b0:52c:e01f:3665 with SMTP id 2adb3069b0e04-52e8266ef2bmr9209184e87.25.1720016409741; Wed, 03 Jul 2024 07:20:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Doug Goldstein , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Oleksii Kurochko Subject: [PATCH for-4.19 3/4] CI: Drop bin86/dev86 from archlinux container Date: Wed, 3 Jul 2024 15:20:01 +0100 Message-Id: <20240703142002.1662874-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240703142002.1662874-1-andrew.cooper3@citrix.com> References: <20240703142002.1662874-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 These packages have moved out of main to AUR, and are not easily accessable any more. Drop them, because they're only needed for RomBIOS which is very legacy these days. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- CC: Anthony PERARD CC: Stefano Stabellini CC: Doug Goldstein CC: Roger Pau Monné CC: Oleksii Kurochko --- automation/build/archlinux/current.dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 8929e9b5f022..657ddd77a85c 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -6,10 +6,8 @@ LABEL maintainer.name="The Xen Project" \ RUN pacman-key --init RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ - bin86 \ bridge-utils \ bzip2 \ - dev86 \ discount \ dtc \ e2fsprogs \ From patchwork Wed Jul 3 14:20:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13722389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 877A1C31D97 for ; Wed, 3 Jul 2024 14:20:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.753086.1161384 (Exim 4.92) (envelope-from ) id 1sP0qE-00054Z-9i; Wed, 03 Jul 2024 14:20:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 753086.1161384; Wed, 03 Jul 2024 14:20:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qE-00053a-5z; Wed, 03 Jul 2024 14:20:14 +0000 Received: by outflank-mailman (input) for mailman id 753086; Wed, 03 Jul 2024 14:20:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sP0qC-00047x-DL for xen-devel@lists.xenproject.org; Wed, 03 Jul 2024 14:20:12 +0000 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [2a00:1450:4864:20::52a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5bd6dfb8-3947-11ef-bbf9-fd08da9f4363; Wed, 03 Jul 2024 16:20:11 +0200 (CEST) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-58ba3e38027so2422295a12.1 for ; Wed, 03 Jul 2024 07:20:11 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm7114707a12.34.2024.07.03.07.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 07:20:10 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5bd6dfb8-3947-11ef-bbf9-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720016411; x=1720621211; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9D47f17k0eWnVPOyYgELEIOXuEmzzN+VDIAEXj1vpPQ=; b=O8x84oyLdlyWlnvbqO+1f3x4yOfri05IZjPnD0l+nEpNcjoSvCmArq9uKbzhIW14X9 mQXki1fASNHaKxVP/MZI3jbJ0s446Lunqm2XrDYdqjF4OvdCCsPmqCsMVs2qNE4LBlM1 Mcb6rVZSl79iq+RoCnbr4i2buVoqUhbNNDKBI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720016411; x=1720621211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9D47f17k0eWnVPOyYgELEIOXuEmzzN+VDIAEXj1vpPQ=; b=bbzSQyQRlg7UBXZtM2UODmETDoXx5Rcna21LWXkqS3gp3ZunHkCAw3zM2IIiVb8o7V j5BEwoQugOrR8GfDlX/eZ1P+sL+8FOc/bkNLjPWtxvDk8MeL+g37nmglUxQZrsMAdRgP CPzGGon8F9I0llSfjTyDBr38fgiJCKeyxYUUT9C/JTxUhYdSxPiqU4E/rS4lI4+eQH2l bWnfmtJWbWSe4RtQCMMpCA0iYl5qFpFeirSCSwjC1HmDLuB9G66K+Ca99noHYV97KYmi DTdTc3A89FNAtaB+EgSTaVusk+XbyoLrRSyX0QrbridjlaumVR5K+Z3/X0aKDxlbe+w4 49gw== X-Gm-Message-State: AOJu0YyeFgQQgk6alk+BOUTtCKO6/j+lkaTL+tZuncJi7Qrk3k8ilCFu /k81rnGhv33+AwUNjqUSvV9dvPku4NQmEF8fYcufA+wALTE+f3Dypxq1rTZotH76xH8DbVCn8h8 LiDo= X-Google-Smtp-Source: AGHT+IGWWOVGP2we9jH3vEZEr5UZXzsR4iV4LLvrc9gpKb7HCwr01s27knTyH/lqEHZ1BTsGm8OBgg== X-Received: by 2002:a05:6402:42c8:b0:58c:34cb:16a9 with SMTP id 4fb4d7f45d1cf-58c34cb1aeamr2572465a12.16.1720016411055; Wed, 03 Jul 2024 07:20:11 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Doug Goldstein , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Oleksii Kurochko Subject: [PATCH for-4.19 4/4] CI: Rework the CentOS7 container Date: Wed, 3 Jul 2024 15:20:02 +0100 Message-Id: <20240703142002.1662874-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240703142002.1662874-1-andrew.cooper3@citrix.com> References: <20240703142002.1662874-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 CentOS 7 is fully End-of-life as of 2024-06-30, and the Yum repo configuration points at URLs which have become non-existent. First, start by using a heredoc RUN for legibility. It's important to use `set -e` to offset the fact that we're no longer chaining every command together with an &&. Also, because we're using a single RUN command to perform all RPM operations, we no longer need to work around the OverlayFS bug. Adjust the CentOS-*.repo files to point at vault.centos.org. Take the opportunity to split the Xen deps from Tools deps, and to adjust the other packages we use: * We need bzip2-devel for the dombuilder, not just bzip2. * zstd-devel is another optional dependency since the last time this package list was refreshed. * openssl-devel hasn't been a dependency since Xen 4.6. * We long ago ceased being able to build Qemu and SeaBIOS in this container, so drop their dependencies too. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- CC: Anthony PERARD CC: Stefano Stabellini CC: Doug Goldstein CC: Roger Pau Monné CC: Oleksii Kurochko --- automation/build/centos/7.dockerfile | 70 +++++++++++++++------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile index 657550f308bb..9e66d72a5bd5 100644 --- a/automation/build/centos/7.dockerfile +++ b/automation/build/centos/7.dockerfile @@ -6,44 +6,48 @@ LABEL maintainer.name="The Xen Project" \ RUN mkdir /build WORKDIR /build -# work around https://github.com/moby/moby/issues/10180 -# and add EPEL for dev86 -RUN rpm --rebuilddb && \ - yum -y install \ - yum-plugin-ovl \ - epel-release \ - && yum clean all && \ - rm -rf /var/cache/yum +RUN <