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

compose extensions: Support --rootfs #3538

Merged
merged 1 commit into from
Mar 28, 2022

Conversation

cgwalters
Copy link
Member

As we're working on "container native" (rpm)-ostree, it feels
natural to have the extensions build happen as part of e.g. a
Dockerfile build that simply pulls in the base image.

And to do that, we don't need any of this "offline" stuff that
the compose extensions path is using. Here we're running
rpm-ostree inside a container, and conceptually we mostly just
need the libdnf side.

@openshift-ci
Copy link

openshift-ci bot commented Mar 24, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@cgwalters cgwalters force-pushed the compose-extensions-incontainer branch 3 times, most recently from 5b0cd96 to cec7714 Compare March 24, 2022 14:32
@cgwalters
Copy link
Member Author

/test all

@cgwalters cgwalters marked this pull request as ready for review March 24, 2022 14:32
@cgwalters
Copy link
Member Author

To test this I did:

(Where . is a checkout of coreos/fedora-coreos-config#1080 )

$ podman run --security-opt label:disable -v .:/src quay.io/coreos-assembler/fcos:testing-devel
# rpm-ostree compose extensions --rootfs=/ --output-dir=/tmp/output /src/github/coreos/fedora-coreos-config/{manifest,extensions}.yaml

@cgwalters cgwalters force-pushed the compose-extensions-incontainer branch from cec7714 to 5261409 Compare March 28, 2022 18:09
@cgwalters
Copy link
Member Author

OK, this should now work in both cases.

As we're working on "container native" (rpm)-ostree, it feels
natural to have the extensions build happen as part of e.g. a
`Dockerfile` build that simply pulls in the base image.

And to do that, we don't need any of this "offline" stuff that
the compose extensions path is using.  Here we're running
rpm-ostree inside a container, and conceptually we mostly just
need the libdnf side.
@cgwalters cgwalters force-pushed the compose-extensions-incontainer branch from 5261409 to 9e4d3da Compare March 28, 2022 18:29
@jmarrero
Copy link
Member

@cgwalters Thank you for this. LGTM

@jmarrero jmarrero enabled auto-merge March 28, 2022 18:34
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

One comment, LGTM overall.

@@ -1469,11 +1472,6 @@ rpmostree_compose_builtin_extensions (int argc, char **argv, RpmOstreeCommandInv
rpmostree_usage_error (context, "TREEFILE and EXTYAML must be specified", error);
return FALSE;
}
if (!opt_repo)
Copy link
Member

Choose a reason for hiding this comment

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

Instead of dropping this, should we enhance it to verify that one and only one of --repo and --rootfs is provided?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, done in #3548

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.

3 participants