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

[4.2] Changes to support F31 in Dockerfile #1121

Closed
wants to merge 3 commits into from
Closed

[4.2] Changes to support F31 in Dockerfile #1121

wants to merge 3 commits into from

Conversation

miabbott
Copy link
Member

In the RHCOS world, a change to the spec file of skopeo caused subscription-manager, dnf, and all the associated dependencies to be dragged into the OS. [0]

While we investigate the impact of disabling Recommends for RHCOS builds, the workaround is to use the exclude-packages support[1] that was recently landed in rpm-ostree. The most direct way to do this is to rebase the Dockerfile for coreos-assembler on F31.

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1798278
[1] coreos/rpm-ostree#1980

cgwalters and others added 3 commits February 10, 2020 13:24
So we have one fewer random place to change when bumping Fedora
versions.  Prep for rebasing on F31.

(cherry picked from commit bee3ec5)
For RHCOS builds, we want the ability to use `exclude-packages`[0]
from `rpm-ostree`.  The easiest way to get this it to start using F31
in the Dockerfile.

[0] coreos/rpm-ostree#1980
@miabbott
Copy link
Member Author

I was able to successfully build RHCOS with this image and a modified manifest to use exclude-packages - https://url.corp.redhat.com/176b62a

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: miabbott
To complete the pull request process, please assign
You can assign the PR to them by writing /assign in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dustymabe
Copy link
Member

hmm.. I thinking for 4.2 we'd want to minimize any changes. I take it what you need is a newer version of rpm-ostree to support exclude-packages. Would it be more conservative to install the version of rpm-ostree from f31, but leave everything else the same?

@miabbott
Copy link
Member Author

Would it be more conservative to install the version of rpm-ostree from f31, but leave everything else the same?

You know I just blindly went for the whole hog replacement, but I should give that conservative approach a shot.

@jlebon
Copy link
Member

jlebon commented Feb 10, 2020

Would it be more conservative to install the version of rpm-ostree from f31, but leave everything else the same?

That probably won't work without also bringing in f31's e.g. librpm, glibc, etc... too. But I can easily rebuild 2020.1 too into the f30 continuous tag. :)

@miabbott
Copy link
Member Author

That probably won't work without also bringing in f31's e.g. librpm, glibc, etc... too. But I can easily rebuild 2020.1 too into the f30 continuous tag. :)

I'll give it a try in parallel to the F30 rebuild, if you would be so kind. :)

@jlebon
Copy link
Member

jlebon commented Feb 10, 2020

It's in the continuous tag now, so a rebuild should pick it up: https://koji.fedoraproject.org/koji/buildinfo?buildID=1458708

@miabbott
Copy link
Member Author

The rebuilt F30 worked flawlessly (obviously!).

Rather than re-use this PR, I'll open a new one with the change needed.

@miabbott miabbott closed this Feb 11, 2020
@miabbott
Copy link
Member Author

#1124

jcajka pushed a commit to jcajka/coreos-assembler that referenced this pull request Mar 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants