archive: consistently respect value of WithSkipDockerManifest #8213
Conversation
It was possible to still export the docker-compatible manifest.json file, if a single platform image (as a standalone manifest) was exported, even if the WithSkipDockerManifest option was explicitly set. To resolve this, we remove all references to skipDockerManifest to, adding it instead to the point-of-writing, simplifying the earlier logic and making it clear exactly when this manifest file should be written. Signed-off-by: Justin Chadwell <[email protected]>
|
Hi @jedevc. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
mikebrow
left a comment
mikebrow
left a comment
There was a problem hiding this comment.
just confirming we are leaving the WithSkipDockerManifest() call from the export command intact setting skipDockerManifest to true.. when "skip-manifest-json" is set ...(and not putting out a warning or error) then ignoring whether or not it is set here in in exporter for the manifest cases..
|
Can we have a test? |
Yup, that is the previous behaviour, exactly. This patch updates to always respect the value, for manifest and for index. We don't ignore entirely, we just leave the value of RepoTags empty, instead of not outputting the file at all - I think this is accidental, based on the index code branch, and the doc strings in the code. |
kzys
left a comment
kzys
left a comment
There was a problem hiding this comment.
Restarting the failed Windows tests.
I agree with @AkihiroSuda. We should have some tests to prevent regression.
Signed-off-by: Justin Chadwell <[email protected]>
|
Added a test, confirmed it fails for the single-platform case before this patch, and succeeds after. I'm not sure if there's an easier way of getting the single-platform manifest descriptor from the index descriptor? |
|
/retest |
thaJeztah
added
the
cherry-pick/1.7.x
thaJeztah
added
cherry-picked/1.6.x
8 participants
🛠️ Fixes moby/buildkit#1949.
It was possible to still export the docker-compatible manifest.json file, if a single platform image (as a standalone manifest) was exported, even if the WithSkipDockerManifest option was explicitly set.
To resolve this, we remove all references to skipDockerManifest to, adding it instead to the point-of-writing, simplifying the earlier logic and making it clear exactly when this manifest file should be written.
cc @tonistiigi @AkihiroSuda