From 263fce1051adc044669fda66655449c8161d6d3f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 29 Jan 2025 06:11:01 +0100 Subject: [PATCH 1/4] images: Set bootc image admin GECOS field config.json cannot do that. Some tests expect this, so let's keep our images uniform. --- images/scripts/bootc.setup | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/scripts/bootc.setup b/images/scripts/bootc.setup index 629190e29d..b5f50f5149 100755 --- a/images/scripts/bootc.setup +++ b/images/scripts/bootc.setup @@ -3,6 +3,9 @@ set -eux IMAGE="$1" +# config.json cannot set GECOS +usermod -c Administrator admin + podman pull quay.io/cockpit/ws podman pull quay.io/jitesoft/nginx From f5903a4653bf822ad2bddd89dd4c9e80d44d8bb0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 29 Jan 2025 07:12:07 +0100 Subject: [PATCH 2/4] images: Update bootc image This gives us the latest packages, so that the image stays compatible with the generated runtime dependencies from the rpm build (such as selinux-policy). However, exclude the kernel as that current causes kernel oopses. --- images/scripts/lib/bootc.Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/scripts/lib/bootc.Containerfile b/images/scripts/lib/bootc.Containerfile index 08846037a7..c3b04f4b02 100644 --- a/images/scripts/lib/bootc.Containerfile +++ b/images/scripts/lib/bootc.Containerfile @@ -3,6 +3,7 @@ FROM $base_image # pre-install the distro version, which is useful for testing extensions and manual experiments RUN \ + dnf update -y --exclude='kernel*' && \ dnf install -y --setopt install_weak_deps=False cockpit-system cockpit-networkmanager && \ dnf clean all From 1a3bf2e3cdcfbe2577698ca48f4ab7afbb45b87d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 28 Jan 2025 21:45:14 +0100 Subject: [PATCH 3/4] images: Add some Cockpit runtime and test deps to centos-9-bootc This will allow us to install cockpit-ws.rpm and run networking and metrics tests. Also toss in strace as the ultimate debugging tool, and rsync for `build.js -r` and a more efficient bots API. See https://github.com/cockpit-project/cockpit/pull/21561 --- images/scripts/lib/bootc.Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/scripts/lib/bootc.Containerfile b/images/scripts/lib/bootc.Containerfile index c3b04f4b02..d58e802f01 100644 --- a/images/scripts/lib/bootc.Containerfile +++ b/images/scripts/lib/bootc.Containerfile @@ -2,9 +2,11 @@ ARG base_image FROM $base_image # pre-install the distro version, which is useful for testing extensions and manual experiments +# also pre-install ws and test dependencies RUN \ dnf update -y --exclude='kernel*' && \ dnf install -y --setopt install_weak_deps=False cockpit-system cockpit-networkmanager && \ + dnf install -y dnsmasq pcp python3-pcp rsync sscg strace system-logos wireguard-tools && \ dnf clean all ADD lib/mcast1.nmconnection /usr/lib/NetworkManager/system-connections/ From a434ce440edd35ac084b8772ab953ba50dc3c4d7 Mon Sep 17 00:00:00 2001 From: Cockpituous Date: Wed, 29 Jan 2025 07:47:51 +0000 Subject: [PATCH 4/4] images: Update centos-9-bootc image --- images/centos-9-bootc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/centos-9-bootc b/images/centos-9-bootc index fdecf998fe..9397b56076 120000 --- a/images/centos-9-bootc +++ b/images/centos-9-bootc @@ -1 +1 @@ -centos-9-bootc-8a227fece37b2710436d8e8345cc7bf858d8499841efc5aa6d6927cd5793857b.qcow2 \ No newline at end of file +centos-9-bootc-ece5b06636c366554dab7e869a011246c8f34b9b46eedbe2a5f7f20b7bbe9e69.qcow2 \ No newline at end of file