fix(image): add logic to detect empty layers #2790
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
DmitriyLewen
changed the title
7 tasks
knqyf263
reviewed
Aug 30, 2022
pkg/fanal/image/daemon/image.go
Outdated
| return true | ||
| } | ||
| // commands here: 'ADD', COPY, RUN and WORKDIR != "/" | ||
| // Also RUN command may don't include 'RUN' prefix |
There was a problem hiding this comment.
Does it happen? I thought RUN was required.
There was a problem hiding this comment.
Suggested change
| // Also RUN command may don't include 'RUN' prefix | |
| // Also RUN command may not include 'RUN' prefix |
There was a problem hiding this comment.
Yes. Image created with docker build command may not include command prefix.
Docker docs have this.
e.g.
Dockerfile:
FROM alpine
RUN mkdir test
RUN apk updateHistory:
➜ docker history 2780:test
IMAGE CREATED CREATED BY SIZE COMMENT
b06f8dfdd74d 6 seconds ago /bin/sh -c apk update 2.29MB
4d55786712ed 8 hours ago /bin/sh -c mkdir test 0B
0ac33e5f5afa 4 months ago /bin/sh -c #(nop) CMD ["/bin/sh"] 0B
<missing> 4 months ago /bin/sh -c #(nop) ADD file:5d673d25da3a14ce1… 5.57MB Also layers created with buildkit have command prefix:
➜ docker history 2780:test2
IMAGE CREATED CREATED BY SIZE COMMENT
8485e63ed150 5 seconds ago RUN /bin/sh -c apk update # buildkit 2.29MB buildkit.dockerfile.v0
<missing> 8 minutes ago RUN /bin/sh -c mkdir test # buildkit 0B buildkit.dockerfile.v0
<missing> 4 months ago /bin/sh -c #(nop) CMD ["/bin/sh"] 0B
<missing> 4 months ago /bin/sh -c #(nop) ADD file:5d673d25da3a14ce1… 5.57MB | { | ||
| name: "ENV", | ||
| history: dimage.HistoryResponseItem{ | ||
| CreatedBy: "/bin/sh -c #(nop) ENV TESTENV=TEST", |
There was a problem hiding this comment.
BuiltKit doesn't have /bin/sh -c #(nop) prefix. I also want to add such a case.
knqyf263
approved these changes
Aug 30, 2022
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.
Description
Added logic to detect empty layers.
Logic is taken from buildkit.
Checklist