fix(ecr-assets): improved compatiblity of TarballImageAsset with different docker versions #33430
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.
Issue
Closes #33428
Reason for this change
The problem seems to be the
sed
expression used here, that expectsdocker load
output to match the expressionLoaded image: <digest>
.However, in the attached docker version
docker load
actually printsLoaded image ID: <digest>
.Just changing the sed expression from
sed "s/Loaded image: //g"
tosed "s/Loaded image[^:]*: //g"
or similar should work for every scenario. For example:Description of changes
Changed the sed expression to obtain the imported tarball digest from
sed "s/Loaded image: //g"
tosed "s/Loaded image[^:]*: //g"
Describe any new or updated permissions being added
No permissions addeed
Description of how you validated changes
I run the sed expression against the original expected output and the one from the latest docker clients:
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license