From 160e7e2b8a796ef640b59c566e2f6da6ed9f414c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 18 Oct 2021 17:00:33 -0400 Subject: [PATCH] Use `deploy-via-container` This will cause us to run through the ostree-native container stack when generating the disk images. Today for RHCOS we're using the "custom origin" stuff which lets us inject metadata about the built source, but rpm-ostree doesn't understand it. With this in the future (particularly after https://github.com/coreos/coreos-assembler/issues/2685) `rpm-ostree status` will show the booted container and *understand it*. We'll have the digest of the OCI archive at least...though that may get changed if it gets converted to docker v2s2 when pushing to a registry... Now in the future what we want is to entirely rework our build pipeline like this: https://github.com/coreos/coreos-assembler/issues/2685 --- image-c9s.yaml | 3 +++ image-rhel-9.2.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/image-c9s.yaml b/image-c9s.yaml index 5263c7cb8..5043d5f79 100644 --- a/image-c9s.yaml +++ b/image-c9s.yaml @@ -1,6 +1,9 @@ # See https://github.com/coreos/coreos-assembler/pull/298 size: 16 +# We default to a container image +deploy-via-container: true + # Disable networking by default on firstboot. We can drop this once cosa stops # defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key. ignition-network-kcmdline: [] diff --git a/image-rhel-9.2.yaml b/image-rhel-9.2.yaml index 17c8d9cc8..4f26660e9 100644 --- a/image-rhel-9.2.yaml +++ b/image-rhel-9.2.yaml @@ -1,6 +1,9 @@ # See https://github.com/coreos/coreos-assembler/pull/298 size: 16 +# We default to a container image +deploy-via-container: true + # Disable networking by default on firstboot. We can drop this once cosa stops # defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key. ignition-network-kcmdline: []