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.

Sign up for GitHub

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

Jump to bottom

Handle <version>-<release> strings that aren't valid container tags #5497

Merged
merged 2 commits into from Oct 3, 2023
Merged

Handle <version>-<release> strings that aren't valid container tags #5497

merged 2 commits into from Oct 3, 2023

Conversation

owtaylor
Copy link
Contributor

@owtaylor owtaylor commented Oct 2, 2023 •
edited

With the new Flatpak generation inside of Koji, we are versioning the containers based on their main packages. So,

ghex-45~beta-2.fc39 => ghex-flatpak-45~beta-1

But '45~beta-1' is not a valid registry tag, so pushing fails. This PR has two parts:

  1. Don't count on the tags in the candidate registry having any particular value - pull by digest instead
  2. Make sure the tags we create in the destination registry are valid

@owtaylor owtaylor requested a review from a team as a code owner October 2, 2023 21:06
@owtaylor owtaylor force-pushed the container-tags branch 3 times, most recently from c806b03 to 0c63a53 Compare October 3, 2023 01:45
@owtaylor @mattiaverga
When copying containers, copy from the source registry by digest
5c87265 
Turning version/release pairs into valid container registry tags can
be tricky (the OCI rules for tags are strict); avoid relying on the
details by copying from the source registry by digest.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
@owtaylor @mattiaverga
When copying containers, make sure tags are valid OCI tags
8a5e88a 
Not everything that is a valid <version>-<release> is a valid tag
for an OCI registry. Coerce the tags that we push containers to to
be valid.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
@mattiaverga mattiaverga added the 7.2-backports Mergify uses this to backport patches to 7.2 label Oct 3, 2023
mattiaverga
mattiaverga approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@mattiaverga mattiaverga left a comment

Choose a reason for hiding this comment

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

Rebased and added news fragment

@mattiaverga mattiaverga merged commit 05521e1 into fedora-infra:develop Oct 3, 2023
26 of 28 checks passed
@mergify mergify bot mentioned this pull request Oct 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattiaverga mattiaverga mattiaverga approved these changes

Assignees
No one assigned
Labels
7.2-backports Mergify uses this to backport patches to 7.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@owtaylor @mattiaverga