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

Use UBI9 base image for container build #586

Merged

Conversation

brianwcook
Copy link
Contributor

@brianwcook brianwcook commented Jul 31, 2024

Change the container build to use UBI9 to support user access to Red Hat entitled content from the subscription service using the subscription manager tool (which wouldn't work with Rocky Linux). Since createrepo_c isn't available from the default RPM repos on UBI, install it from pypi instead. This is tied to the WIP/tech-preview RPM prefetching work.

Maintainers will complete the following section

  • Commit messages are descriptive enough
  • [-] Code coverage from testing does not decrease and new code is covered
  • [-] Docs updated (if applicable)
  • [-] Docs links in the code are still valid (if docs were updated)

Note: if the contribution is external (not from an organization member), the CI
pipeline will not run automatically. After verifying that the CI is safe to run:

@ben-alkov
Copy link
Member

@brianwcook; For your awareness - please address CI failures.

@brianwcook
Copy link
Contributor Author

I don't see the same build failure locally. I re-ran pip-compile with a clean venv to see if it solves the problem.

@brunoapimentel
Copy link
Contributor

/ok-to-test

requirements.txt Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
@brianwcook brianwcook force-pushed the use-ubi-base-image branch 2 times, most recently from add0ede to 0f46d9f Compare August 1, 2024 16:16
Copy link
Member

@eskultety eskultety left a comment

Choose a reason for hiding this comment

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

@brianwcook sorry for the delay, had other duties last week, now I'm back on this. Please rebase onto the latest main HEAD to get rid of the merge commit you have, we don't do merge commits here.
I adjusted the PR description ever so slightly to make it completely clear that this change is driven solely by the need to support access to entitled subscription-based content.

Dockerfile Outdated Show resolved Hide resolved
@brianwcook brianwcook force-pushed the use-ubi-base-image branch 2 times, most recently from 9947a5a to c137979 Compare August 5, 2024 12:25
Copy link
Member

@eskultety eskultety left a comment

Choose a reason for hiding this comment

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

There was a hiccup in your rebase - you've got some unrelated (already merged) changes (e.g. commits 36b011c, 1b3bd80) in your latest revision.

@brianwcook
Copy link
Contributor Author

alright how 'bout now?

Copy link
Contributor

@brunoapimentel brunoapimentel left a comment

Choose a reason for hiding this comment

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

This LGTM, I only wonder if we should add a note to the commit message that the need to install subscription-manager comes from konflux-ci/build-definitions#1205.

I don't think it will be very clear to people even after #580 comes in.

This changes the container build to use UBI9 so that it is supportable
by a major user (Red Hat) with subscription enabled repositories. The
change requires using createrepo_c from PyPyi since the createrepo_c rpm
is not distributed as part of the UBI9 content set and it is desireable
to keep this image freely redistributable. Chaniging to UBI keeps
maintenance to a minimum (just one image flavor) but in the future
multiple images could be maintained if required.

The subscription-manager package is included to support
konflux-ci/build-definitions#1205 and
containerbuildsystem#580 where it will be
used to obtain TLS certificates to send to authenticate to private
repositories.

Signed-off-by: Brian Cook <[email protected]>
@brianwcook
Copy link
Contributor Author

This LGTM, I only wonder if we should add a note to the commit message that the need to install subscription-manager comes from konflux-ci/build-definitions#1205.

I don't think it will be very clear to people even after #580 comes in.

added your comment and rebased again.

@brunoapimentel brunoapimentel added this pull request to the merge queue Aug 12, 2024
Merged via the queue into containerbuildsystem:main with commit 1e0e912 Aug 12, 2024
21 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.

4 participants