Browse Source

pass proxy config as build args - same as docker/buildx#959

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 2 years ago
parent
commit
3e12a7cb23
1 changed files with 7 additions and 0 deletions
  1. 7 0
      pkg/compose/build.go

+ 7 - 0
pkg/compose/build.go

@@ -25,6 +25,7 @@ import (
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/platforms"
 	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/build"
 	_ "github.com/docker/buildx/driver/docker" // required to get default driver registered
 	_ "github.com/docker/buildx/driver/docker" // required to get default driver registered
+	"github.com/docker/buildx/store/storeutil"
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/buildflags"
 	xprogress "github.com/docker/buildx/util/progress"
 	xprogress "github.com/docker/buildx/util/progress"
 	"github.com/docker/docker/builder/remotecontext/urlutil"
 	"github.com/docker/docker/builder/remotecontext/urlutil"
@@ -224,6 +225,12 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
 
 
 	buildArgs := flatten(service.Build.Args.Resolve(envResolver(project.Environment)))
 	buildArgs := flatten(service.Build.Args.Resolve(envResolver(project.Environment)))
 
 
+	for k, v := range storeutil.GetProxyConfig(s.dockerCli) {
+		if _, ok := buildArgs[k]; !ok {
+			buildArgs[k] = v
+		}
+	}
+
 	plats, err := addPlatforms(project, service)
 	plats, err := addPlatforms(project, service)
 	if err != nil {
 	if err != nil {
 		return build.Options{}, err
 		return build.Options{}, err