From 0ff94b1b16c54cf904b540aeb180c1173b5a2b14 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 12 Feb 2025 15:15:16 -0500 Subject: [PATCH 1/3] build: Use lint --fatal-warnings We want to have clean images so opt in to fatal warnings. --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 0341637..8a744a2 100644 --- a/Containerfile +++ b/Containerfile @@ -14,5 +14,5 @@ set -xeuo pipefail # Cleanup /usr/share/doc/bootc-image-standard/stage-clean # And lint. -bootc container lint +bootc container lint --fatal-warnings EORUN From f3840319f37f9f14ea2ff58233580c5d9fbec36c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 12 Feb 2025 15:15:30 -0500 Subject: [PATCH 2/3] base: Add tmpfiles.d entry for /var/lib/rpm-state Needed for https://github.com/containers/bootc/pull/1101 which will cross check /var and tmpfiles.d. --- base/manifest.yaml | 1 + base/tmpfiles.yaml | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 base/tmpfiles.yaml diff --git a/base/manifest.yaml b/base/manifest.yaml index e1c31fa..f45e244 100644 --- a/base/manifest.yaml +++ b/base/manifest.yaml @@ -16,6 +16,7 @@ remove-from-packages: include: - postprocess-conf.yaml + - tmpfiles.yaml - bootc.yaml - bootupd.yaml - ostree.yaml diff --git a/base/tmpfiles.yaml b/base/tmpfiles.yaml new file mode 100644 index 0000000..d37ef7f --- /dev/null +++ b/base/tmpfiles.yaml @@ -0,0 +1,7 @@ +postprocess: + - | + #!/bin/bash + cat >/usr/lib/tmpfiles.d/bootc-base-rpmstate.conf <<'EOF' + # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=771713 + d /var/lib/rpm-state 0755 - - - + EOF From bfecdb1b399c6b14e2f500be08fefa620a7e9a72 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 12 Feb 2025 18:01:14 -0500 Subject: [PATCH 3/3] Add tmpfiles.d/bootc-legacy-contentsets.conf This one works around the problem fixed by https://github.com/konflux-ci/build-tasks-dockerfiles/pull/243 I put this one in the default image and not core because it's not a "core" problem conceptually. Signed-off-by: Colin Walters --- usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf diff --git a/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf b/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf new file mode 100644 index 0000000..25d21f7 --- /dev/null +++ b/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf @@ -0,0 +1,5 @@ +# Workaround for https://github.com/konflux-ci/build-tasks-dockerfiles/pull/243 +d /var/roothome/buildinfo 0755 - - - +d /var/roothome/buildinfo/content_manifests 0755 - - - +# Note we don't actually try to recreate the content; this just makes the linter ignore it +f /var/roothome/buildinfo/content_manifests/content-sets.json 0644 - - -