Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

anaconda/ostree: Ensure we set target image reference #413

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

cgwalters
Copy link
Contributor

Basically anaconda/kickstart lacks support for --target-image which we need when installing from a container image embedded in the ISO. Work around it with an injected %post.

Closes: #380

Basically anaconda/kickstart lacks support for `--target-image`
which we need when installing from a container image embedded
in the ISO.  Work around it with an injected `%post`.

Closes: osbuild#380
@mvo5 mvo5 self-requested a review February 5, 2024 14:35
@achilleas-k achilleas-k requested review from achilleas-k and removed request for mvo5 February 5, 2024 14:35
@achilleas-k
Copy link
Member

Small manual test using bib manifest generation:

› go build -o bib-main ./cmd/bootc-image-builder
› go mod edit -replace github.com/osbuild/images=github.com/cgwalters/osbuild-images@ostreecontainer-target
› go mod tidy
go: downloading github.com/cgwalters/osbuild-images v0.0.0-20240131014547-1941b50b578f
› go build -o bib-target ./cmd/bootc-image-builder
› sudo ./bib-main --type iso manifest quay.io/centos-bootc/centos-bootc:stream9 | jq > manifest-main.json
› sudo ./bib-target --type iso manifest quay.io/centos-bootc/centos-bootc:stream9 | jq > manifest-target.json
› diff manifest-main.json manifest-target.json
3571c3571
<             "volid": "fb444b46"
---
>             "volid": "325e5495"
3687c3687
<             "file-c5170d5ec12c8a3183834a0fa1cb488c074dafedac0311d556325a1d5ee92c22": {
---
>             "file-53814d30aebe6cc4ea170f827e1f42c2f1e3488d6f677ef967e169d8f1113954": {
3692c3692
<                   "id": "sha256:c5170d5ec12c8a3183834a0fa1cb488c074dafedac0311d556325a1d5ee92c22"
---
>                   "id": "sha256:53814d30aebe6cc4ea170f827e1f42c2f1e3488d6f677ef967e169d8f1113954"
3700c3700
<                 "from": "input://file-c5170d5ec12c8a3183834a0fa1cb488c074dafedac0311d556325a1d5ee92c22/sha256:c5170d5ec12c8a3183834a0fa1cb488c074dafedac0311d556325a1d5ee92c22",
---
>                 "from": "input://file-53814d30aebe6cc4ea170f827e1f42c2f1e3488d6f677ef967e169d8f1113954/sha256:53814d30aebe6cc4ea170f827e1f42c2f1e3488d6f677ef967e169d8f1113954",
6241c6241
<         "sha256:c5170d5ec12c8a3183834a0fa1cb488c074dafedac0311d556325a1d5ee92c22": {
---
>         "sha256:53814d30aebe6cc4ea170f827e1f42c2f1e3488d6f677ef967e169d8f1113954": {
6243c6243
<           "data": "CiVpbmNsdWRlIC9ydW4vaW5zdGFsbC9yZXBvL29zYnVpbGQtYmFzZS5rcwoKcm9vdHB3IC0tbG9jawoKbGFuZyBlbl9VUy5VVEYtOAprZXlib2FyZCB1cwp0aW1lem9uZSBVVEMKCmNsZWFycGFydCAtLWFsbAoKcmVxcGFydCAtLWFkZC1ib290CgpwYXJ0IHN3YXAgLS1mc3R5cGU9c3dhcCAtLXNpemU9MTAyNApwYXJ0IC8gLS1mc3R5cGU9ZXh0NCAtLWdyb3cKCnJlYm9vdCAtLWVqZWN0Cg=="
---
>           "data": "CiVpbmNsdWRlIC9ydW4vaW5zdGFsbC9yZXBvL29zYnVpbGQtYmFzZS5rcwoKcm9vdHB3IC0tbG9jawoKbGFuZyBlbl9VUy5VVEYtOAprZXlib2FyZCB1cwp0aW1lem9uZSBVVEMKCmNsZWFycGFydCAtLWFsbAoKcmVxcGFydCAtLWFkZC1ib290CgpwYXJ0IHN3YXAgLS1mc3R5cGU9c3dhcCAtLXNpemU9MTAyNApwYXJ0IC8gLS1mc3R5cGU9ZXh0NCAtLWdyb3cKCnJlYm9vdCAtLWVqZWN0CiVwb3N0CmJvb3RjIHN3aXRjaCAtLW11dGF0ZS1pbi1wbGFjZSAtLXRyYW5zcG9ydCByZWdpc3RyeSBxdWF5LmlvL2NlbnRvcy1ib290Yy9jZW50b3MtYm9vdGM6c3RyZWFtOQolZW5kCg=="

› base64 -d <<< CiVpbmNsdWRlIC9ydW4vaW5zdGFsbC9yZXBvL29zYnVpbGQtYmFzZS5rcwoKcm9vdHB3IC0tbG9jawoKbGFuZyBlbl9VUy5VVEYtOAprZXlib2FyZCB1cwp0aW1lem9uZSBVVEMKCmNsZWFycGFydCAtLWFsbAoKcmVxcGFydCAtLWFkZC1ib290CgpwYXJ0IHN3YXAgLS1mc3R5cGU9c3dhcCAtLXNpemU9MTAyNApwYXJ0IC8gLS1mc3R5cGU9ZXh0NCAtLWdyb3cKCnJlYm9vdCAtLWVqZWN0CiVwb3N0CmJvb3RjIHN3aXRjaCAtLW11dGF0ZS1pbi1wbGFjZSAtLXRyYW5zcG9ydCByZWdpc3RyeSBxdWF5LmlvL2NlbnRvcy1ib290Yy9jZW50b3MtYm9vdGM6c3RyZWFtOQolZW5kCg==

%include /run/install/repo/osbuild-base.ks

rootpw --lock

lang en_US.UTF-8
keyboard us
timezone UTC

clearpart --all

reqpart --add-boot

part swap --fstype=swap --size=1024
part / --fstype=ext4 --grow

reboot --eject
%post
bootc switch --mutate-in-place --transport registry quay.io/centos-bootc/centos-bootc:stream9
%end

› diff <(base64 -d <<< CiVpbmNsdWRlIC9ydW4vaW5zdGFsbC9yZXBvL29zYnVpbGQtYmFzZS5rcwoKcm9vdHB3IC0tbG9jawoKbGFuZyBlbl9VUy5VVEYtOAprZXlib2FyZCB1cwp0aW1lem9uZSBVVEMKCmNsZWFycGFydCAtLWFsbAoKcmVxcGFydCAtLWFkZC1ib290CgpwYXJ0IHN3YXAgLS1mc3R5cGU9c3dhcCAtLXNpemU9MTAyNApwYXJ0IC8gLS1mc3R5cGU9ZXh0NCAtLWdyb3cKCnJlYm9vdCAtLWVqZWN0Cg==)  <(base64 -d <<< CiVpbmNsdWRlIC9ydW4vaW5zdGFsbC9yZXBvL29zYnVpbGQtYmFzZS5rcwoKcm9vdHB3IC0tbG9jawoKbGFuZyBlbl9VUy5VVEYtOAprZXlib2FyZCB1cwp0aW1lem9uZSBVVEMKCmNsZWFycGFydCAtLWFsbAoKcmVxcGFydCAtLWFkZC1ib290CgpwYXJ0IHN3YXAgLS1mc3R5cGU9c3dhcCAtLXNpemU9MTAyNApwYXJ0IC8gLS1mc3R5cGU9ZXh0NCAtLWdyb3cKCnJlYm9vdCAtLWVqZWN0CiVwb3N0CmJvb3RjIHN3aXRjaCAtLW11dGF0ZS1pbi1wbGFjZSAtLXRyYW5zcG9ydCByZWdpc3RyeSBxdWF5LmlvL2NlbnRvcy1ib290Yy9jZW50b3MtYm9vdGM6c3RyZWFtOQolZW5kCg==)
17a18,20
> %post
> bootc switch --mutate-in-place --transport registry quay.io/centos-bootc/centos-bootc:stream9
> %end

Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@achilleas-k achilleas-k added this pull request to the merge queue Feb 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 6, 2024
@cgwalters cgwalters added this pull request to the merge queue Feb 7, 2024
Merged via the queue into osbuild:main with commit f98e064 Feb 7, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use bootc switch --mutate-in-place for the Anaconda Container Installer
2 participants