Merge branch 'enable-bootc-default' into 'main'

Two bits

See merge request cgwalters-playground/bootc-demo-base-images!7
This commit is contained in:
Colin Walters 2023-09-08 19:23:59 +00:00
commit 51c5948740
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions

View File

@ -30,7 +30,7 @@ build-push:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
COMPOSE_INITIALIZE: "1"
COMPOSE_INITIALIZE: ""
FORCE: ""
stage: build
before_script:

View File

@ -16,3 +16,9 @@ exclude-packages:
# chosen as the package to satisfy the `kernel-core` dependency from
# the kernel package.
- kernel-debug-core
# rpm-ostree can be an alias for bootc, we want to enable that here.
postprocess:
- |
#!/usr/bin/env bash
ln -sr /usr/bin/{rpm-ostree,bootc}