c8d: Fix building Dockerfiles that have FROM scratch
#46284
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
vvoland
added
area/builder
status/2-code-review
kind/bugfix
|
LOL, wondering now if we can somehow skip the (not something new, so not for this PR; looks like the same is the case without containerd-integration) |
rumpl
reviewed
Aug 22, 2023
vvoland
force-pushed
the
c8d-legacybuilder-fix-from-scratch
branch
from
90566c1
to
1cc0069
Compare
rumpl
reviewed
Aug 22, 2023
If the diff is empty and don't produce an empty layer. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This allows the legacy builder to apply changes to the `FROM scratch` layer. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
If the lease doesn't exit (for example when creating the container failed), just ignore the not found error. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
force-pushed
the
c8d-legacybuilder-fix-from-scratch
branch
from
1cc0069
to
bedcc94
Compare
thaJeztah
reviewed
Aug 22, 2023
| @@ -224,6 +224,25 @@ func ApplyUncompressedLayer(dest string, layer io.Reader, options *TarOptions) ( | |||
| return applyLayerHandler(dest, layer, options, false) | |||
| } | |||
|
|
|||
| // IsEmpty checks if the tar archive is empty (doesn't contain any entries). | |||
| func IsEmpty(rd io.Reader) (bool, error) { | |||
There was a problem hiding this comment.
And now I'm wondering; could we still detect this using "Ye olde sha" of the empty tar?
Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.
There was a problem hiding this comment.
^^ for future reference; this was reverted; it turned out that there was no canonical digest for "empty archive", and the code below was not "too heavy", so it wouldn't gain us much.
rumpl
approved these changes
Aug 23, 2023
vvoland
force-pushed
the
c8d-legacybuilder-fix-from-scratch
branch
from
8a2ec67
to
bedcc94
Compare
rumpl
approved these changes
Aug 23, 2023
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.
FROM scratch#46248DOCKER_BUILDKIT=0docker/for-mac#6853 (comment)- What I did
Fix running containers with empty
Image.- How I did it
See commits.
- How to verify it
c8d integration tests (#45232) from
TestDockerCLIBuildSuite:Before
After
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)