docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-10-31 08:03:43 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: use better error in named contexts not supported

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2022-02-22 21:55:44 -08:00
parent 10debb577e
commit b5bf28d722
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands/bake.go
View File

@@ -147,7 +147,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
resp, err := build.Build(ctx, dis, bo, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer) resp, err := build.Build(ctx, dis, bo, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer)
if err != nil { if err != nil {
return err return wrapBuildError(err, true)
} }
if len(in.metadataFile) > 0 && resp != nil { if len(in.metadataFile) > 0 && resp != nil {

11
commands/build.go
View File

@@ -226,7 +226,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) (err error) {
} }
imageID, err := buildTargets(ctx, dockerCli, map[string]build.Options{defaultTargetName: opts}, in.progress, contextPathHash, in.builder, in.metadataFile) imageID, err := buildTargets(ctx, dockerCli, map[string]build.Options{defaultTargetName: opts}, in.progress, contextPathHash, in.builder, in.metadataFile)
err = wrapBuildError(err) err = wrapBuildError(err, false)
if err != nil { if err != nil {
return err return err
} }
@@ -526,14 +526,19 @@ func decodeExporterResponse(exporterResponse map[string]string) map[string]inter
return out return out
} }
func wrapBuildError(err error) error { func wrapBuildError(err error, bake bool) error {
if err == nil { if err == nil {
return nil return nil
} }
st, ok := grpcerrors.AsGRPCStatus(err) st, ok := grpcerrors.AsGRPCStatus(err)
if ok { if ok {
if st.Code() == codes.Unimplemented && strings.Contains(st.Message(), "unsupported frontend capability moby.buildkit.frontend.contexts") { if st.Code() == codes.Unimplemented && strings.Contains(st.Message(), "unsupported frontend capability moby.buildkit.frontend.contexts") {
return &wrapped{err, "current frontend does not support --build-context. Named contexts are supported since Dockerfile v1.4"} msg := "current frontend does not support --build-context."
if bake {
msg = "current frontend does not support defining additional contexts for targets."
}
msg += " Named contexts are supported since Dockerfile v1.4. Use #syntax directive in Dockerfile or update to latest BuildKit."
return &wrapped{err, msg}
} }
} }
return err return err