Set BuildKit's ExportedProduct variable to show useful errors in the future #37439
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
|
full diff: moby/buildkit@9acf51e...c3846bd |
thaJeztah
reviewed
Jul 11, 2018
| github.com/containerd/containerd 08f7ee9828af1783dc98cc5cc1739e915697c667 | ||
| github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788 | ||
| github.com/containerd/containerd b41633746ed4833f52c3c071e8edcfa2713e5677 | ||
| github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40 |
There was a problem hiding this comment.
double-checked, and these all match what's already in moby/vendor.conf
tonistiigi
approved these changes
Jul 11, 2018
tiborvass
force-pushed
the
vendor-buildkit
branch
from
f30077a
to
0e57b2d
Compare
Codecov Report
@@ Coverage Diff @@
## master #37439 +/- ##
=========================================
Coverage ? 34.95%
=========================================
Files ? 610
Lines ? 44878
Branches ? 0
=========================================
Hits ? 15685
Misses ? 27073
Partials ? 2120 |
tiborvass
changed the title
tiborvass
force-pushed
the
vendor-buildkit
branch
from
0e57b2d
to
1aa26e2
Compare
AkihiroSuda
reviewed
Jul 12, 2018
| @@ -14,4 +14,5 @@ const ( | |||
| RuncCommitID = "library-import" | |||
| InitCommitID = "library-import" | |||
| PlatformName = "" | |||
| ProductName = "" | |||
There was a problem hiding this comment.
Better to have a default value? (moby? moby-engine? dockerd?)
There was a problem hiding this comment.
I think it's better to keep it empty, because there are no "moby releases". Docker will set this.
tonistiigi
reviewed
Jul 12, 2018
cmd/dockerd/docker.go
Outdated
| @@ -42,6 +43,10 @@ func newDaemonCommand() *cobra.Command { | |||
| return cmd | |||
| } | |||
|
|
|||
| func init() { | |||
| apicaps.ExportedProduct = dockerversion.ProductName | |||
There was a problem hiding this comment.
if dockerversion.ProductName != ""
tiborvass
force-pushed
the
vendor-buildkit
branch
from
1aa26e2
to
5080d67
Compare
thaJeztah
requested changes
Jul 16, 2018
hack/make/.go-autogen
Outdated
| @@ -21,6 +21,7 @@ const ( | |||
| IAmStatic string = "${IAMSTATIC:-true}" | |||
| ContainerdCommitID string = "${CONTAINERD_COMMIT}" | |||
| PlatformName string = "${PLATFORM}" | |||
| ProductName string = "$PRODUCT" | |||
builder/builder-next/controller.go
Outdated
| Frontends: frontends, | ||
| CacheKeyStorage: cacheStorage, | ||
| ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager), | ||
| // ResolveCacheExporterFunc: ce, |
There was a problem hiding this comment.
Why's this commented out? Does this need a TODO?
| @@ -83,7 +83,7 @@ func (e *imageExporterInstance) Export(ctx context.Context, ref cache.ImmutableR | |||
| if ref != nil { | |||
| layersDone := oneOffProgress(ctx, "exporting layers") | |||
|
|
|||
| if err := ref.Finalize(ctx); err != nil { | |||
| if err := ref.Finalize(ctx, true); err != nil { | |||
There was a problem hiding this comment.
Not a super-fan of this boolean argument, but 🤷♂️
There was a problem hiding this comment.
That's in buildkit. Feel free to change it there, but I don't think it's a blocker for this PR.
There was a problem hiding this comment.
Yes, I saw it was implemented there :-)
added 3 commits
July 16, 2018 21:41
Signed-off-by: Tibor Vass <tibor@docker.com>
This introduces a PRODUCT environment variable that is used to set a constant at dockerversion.ProductName. That is then used to set BuildKit's ExportedProduct variable in order to show useful error messages to users when a certain version of the product doesn't support a BuildKit feature. Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
tiborvass
force-pushed
the
vendor-buildkit
branch
from
5080d67
to
8159922
Compare
|
@thaJeztah addressed. |
|
unrelated CI failures |
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.
This introduces a PRODUCT environment variable that is used to set a constant
at dockerversion.ProductName.
That is then used to set BuildKit's ExportedProduct variable in order to show
useful error messages to users when a certain version of the product doesn't
support a BuildKit feature.
Vendors buildkit to c3846bd8c419d280053e4a9ba4506577665ab94d