fix bug that cann't recognize ONBUILD in schemaV1 img #3053
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
yyb196
force-pushed
the
fix_schema1_onbuild
branch
2 times, most recently
from
e356c83
to
2c7ed2c
Compare
yyb196
changed the title
yyb196
force-pushed
the
fix_schema1_onbuild
branch
2 times, most recently
from
e924d18
to
9b74216
Compare
yyb196
changed the title
tonistiigi
reviewed
Aug 23, 2022
| @@ -30,6 +30,7 @@ import ( | |||
| "github.com/moby/buildkit/util/apicaps" | |||
| binfotypes "github.com/moby/buildkit/util/buildinfo/types" | |||
| "github.com/moby/buildkit/util/gitutil" | |||
| "github.com/moby/buildkit/util/imageutil" | |||
There was a problem hiding this comment.
imageutil imports many containerd libraries and isn't ideal to be imported here. Move the image types to a separate package that is imported both by dockerfile and imageutil.
There was a problem hiding this comment.
@tonistiigi thanks for your review, I have move the Image definition to a new package under util/schema1, PTALA.
yyb196
force-pushed
the
fix_schema1_onbuild
branch
from
9b74216
to
ee7fa5b
Compare
tonistiigi
reviewed
Aug 24, 2022
| @@ -30,6 +30,7 @@ import ( | |||
| "github.com/moby/buildkit/util/apicaps" | |||
| binfotypes "github.com/moby/buildkit/util/buildinfo/types" | |||
| "github.com/moby/buildkit/util/gitutil" | |||
| "github.com/moby/buildkit/util/schema1" | |||
There was a problem hiding this comment.
This isn't technically schema1. Schema1 is that V1Compatibility mess. Put it under exporter/containerimage/image
There was a problem hiding this comment.
According to your suggestion, move Image definition to package exporter/containerimage/image, PTALA.
fix bug moby#3052 Original `convertSchema1ConfigMeta` fuction using the wrong `ocispec.Image` type to unmarshal schemaV1 image config, Which miss ONBUILD field, the correct `Image` type was defined in `frontend/dockerfile/dockerfile2llb/image.go`, I move its definition to `exporter/containerimage/image`, then both package `util/imageutil` and `frontend/dockerfile` could use the correct `Image` type. Signed-off-by: frank yang <yyb196@gmail.com>
yyb196
force-pushed
the
fix_schema1_onbuild
branch
from
ee7fa5b
to
9dd3dfd
Compare
tonistiigi
approved these changes
Aug 25, 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.
fix bug #3052
Original
convertSchema1ConfigMetafuction usingthe wrong
ocispec.Imagetype to unmarshal schemaV1image config, Which miss OnBbuild field, the correct
Imagetype was defined infrontend/dockerfile/dockerfile2llb/image.go,I move its definition to
exporter/containerimage/image, then bothpackage
util/imageutilandfrontend/dockerfilecoulduse the correct
Imagetype.Signed-off-by: frank yang yyb196@gmail.com