Set container local names explicitly #3398
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The PR which added manifest lists and the format-request-map was changed to include two containers for the `with-container` compose requests [1] was rebased after the PR which added RHEL 8.9 and RHEL 9.3 was merged [2]. The test manifests were not updated after the rebase, so they were never created with the new request. Updating them now. [1] osbuild#3336 [2] osbuild#3350
Set the LocalName for the spec using a separate argument in the NewSpec() constructor instead of reusing the `source` arg. The name is already available in the calling scope in the client's Resolve() method. If the LocalName is an empty string, default to the remote (source) reference. This is a change from the previous behaviour which only used the base source.Name(). The full source corresponds to the user-provided source value, which includes any specified tag or digest. The `name` argument which is used in the `Resolve()` function should always correspond to the user-provided container name.
achilleas-k
force-pushed
the
container-localname
branch
from
98e7a51
to
0c3c693
Compare
|
Didn't review yet, but I wonder if #3395 is attempting to solve a similar problem and should be closed as duplicate? (although there is literally zero information in that PR and commit messages also don't help much) |
Add name field to the manifest-list-test container in the test request. The value is the same as the source but with a `v1` tag added. In the manifests, the name field for the manifest-list-test is added to the skopeo stage. The `name` option of the fedora-minimal container in the skopeo stage is also changed to reflect the full source reference including the `latest` tag.
Add a local name for the fedora minimal image which includes the tag `v1`. Check the image info for the expected names: 1. For the fedora-minimal image, the name as it appears in the blueprint should be included in the names list. 2. For the manifest-list-test image, the full source reference should be included in the names list since no name was specified in the blueprint.
achilleas-k
force-pushed
the
container-localname
branch
from
0c3c693
to
eeff366
Compare
Ah yes. I forgot about that one. I'll close it in favour of this. |
3 tasks
schutzbot
reviewed
Apr 19, 2023
There was a problem hiding this comment.
Manifest-diff job [0] as manifests.diff.
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
namefield in the blueprint customizations for containers was ignored. We now use it to set theLocalNameand fall back to the source value when it's not.This is a behaviour change for both cases:
nameset, the full string is added to theLocalNamefield in the spec.nameis not set, the fullsourcestring is added to theLocalNamefield in the spec. Previously, thesource.Name()was added instead, which corresponds to the source container name without any tag or digest.The
LocalNameis then set in the manifest as thenameoption for the input image in the skopeo source. This is used when importing the image in the skopeo stage: https://github.com/osbuild/osbuild/blob/7cd36f9797a8de740afdd4f9e22cfa004bf04531/stages/org.osbuild.skopeo#L176-L178As a result, the
namesarray in theimages.jsonfile is populated with thename(orsource) from the blueprint (or compose request), including any tags or digests the user has specified.In the specific case where a user specifies a
name, it gives the user the ability to rename an image or add a tag of their own.In the case where a user does not specify a
name, it preserves any tag that was used to define the image.The most important behaviour change is that local images are no longer tagged as
latestwhen thename(orsourceif empty) is specified with a digest. Previously, all images were tagged aslatestin the image, which is the standard tag given when no tag is specified during theskopeo copy. Now, thelatesttag is automatically added if thenameorsourcecontains no other tag or digest.Fixes COMPOSER-1952
This pull request includes: