From 34f95a2b7700ba17de1494bfc51fe2c8e51ca5fb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 9 Jan 2025 18:10:45 -0500
Subject: [PATCH] Move container metadata into the Containerfile

Less bespoke buildsystem.
---
 Containerfile            |  9 +++++++++
 fedora-bootc-config.json | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 fedora-bootc-config.json

diff --git a/Containerfile b/Containerfile
index cd14401..a54f1c9 100644
--- a/Containerfile
+++ b/Containerfile
@@ -66,6 +66,15 @@ EORUN
 # At this point we're done with the builder image and we have our OCI archive.
 
 FROM oci-archive:./out.ociarchive
+# We've cargo culted this one around, xref https://pagure.io/fork/cverna/fedora-kiwi-descriptions/c/a12446bbe98404cb4b30d4b07505ecf71a88dfcb
+ENV container=oci
+# Required for systemd being the default entrypoint
+STOPSIGNAL SIGRTMIN+3
+# https://containers.github.io/bootc/bootc-images.html#standard-metadata-for-bootc-compatible-images
+LABEL containers.bootc 1
+# This is our recommended way to link between the base image and
+# a tool to make disk images.
+LABEL bootc.diskimage-builder quay.io/centos-bootc/bootc-image-builder
 # Need to reference builder here to force ordering. But since we have to run
 # something anyway, we might as well cleanup after ourselves.
 RUN --mount=type=bind,from=builder,src=.,target=/var/tmp \
diff --git a/fedora-bootc-config.json b/fedora-bootc-config.json
deleted file mode 100644
index 9339255..0000000
--- a/fedora-bootc-config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "Labels": {
-        "containers.bootc": "1",
-        "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
-    },
-    "StopSignal": "SIGRTMIN+3",
-    "Env": [
-        "container=oci"
-    ]
-}