WIP: Build via Containerfile and derive from fedora-bootc

Containerfile

@@ -0,0 +1,6 @@
+# https://gitlab.com/fedora/bootc/base-images/-/issues/25
+FROM quay.io/jlebon/fedora-bootc:tier-x-42
+# uncomment when using custom rpm-ostree
+# COPY rpm-ostree /usr/bin/
+COPY . /src
+RUN rpm-ostree experimental compose treefile-apply /src/manifest.yaml

manifest.yaml

@@ -1,6 +1,7 @@
 variables:
   stream: rawhide
   prod: false
+  deriving: true
 
 releasever: 42
 

manifests/fedora-coreos-base.yaml

@@ -16,7 +16,9 @@ include:
 conditional-include:
   # starting from f42, we inherit from tier-x
   # once we're on f42, we can move this up to the default list of includes above
-  - if: releasever >= 42
+  - if:
+    - releasever >= 42
+    - deriving == false
     include: tier-x.yaml
   # all these are inherited from tier-x in f42+, but we carry them here to
   # enforce that there's really no coupling until f42

manifests/fedora-coreos.yaml

@@ -11,6 +11,10 @@ metadata:
 add-commit-metadata:
   fedora-coreos.stream: ${stream}
 
+variables:
+  # upper manifests can override this when deriving from tier-x instead of doing
+  # a base compose
+  deriving: false
 
 include: fedora-coreos-base.yaml
 conditional-include:
@@ -101,8 +105,14 @@ postprocess:
     # information.
 
     EOF
-    cat /usr/etc/rpm-ostreed.conf >> /tmp/rpm-ostreed.conf
-    cp /tmp/rpm-ostreed.conf /usr/etc/rpm-ostreed.conf
+    conf_file=/usr/etc/rpm-ostreed.conf
+    # if we're deriving, then the config is in /etc already
+    if [ -f /run/.containerenv ]; then
+      conf_file=/etc/rpm-ostreed.conf
+    fi
+
+    cat "${conf_file}" >> /tmp/rpm-ostreed.conf
+    cp /tmp/rpm-ostreed.conf "${conf_file}"
     rm /tmp/rpm-ostreed.conf
   # Make sure that we do not ship broken symlinks:
   # https://github.com/coreos/fedora-coreos-config/issues/1782