fix: respect HTTP proxy settings

This should correctly apply `HTTP_PROXY` settings when set via the build
args.

Signed-off-by: Andrey Smirnov <[email protected]>

Author: smira

internal/pkg/convert/graph.go

@@ -29,6 +29,8 @@ type GraphLLB struct {
 
 	baseImageProcessor llbProcessor
 	cache              map[*solver.PackageNode]llb.State
+
+	commonRunOptions []llb.RunOption
 }
 
 type llbProcessor func(llb.State) llb.State
@@ -41,6 +43,10 @@ func NewGraphLLB(graph *solver.PackageGraph, options *environment.Options) *Grap
 		cache:        make(map[*solver.PackageNode]llb.State),
 	}
 
+	if options.ProxyEnv != nil {
+		result.commonRunOptions = append(result.commonRunOptions, llb.WithProxy(*options.ProxyEnv))
+	}
+
 	result.buildBaseImages()
 	result.buildChecksummer()
 	result.buildLocalContext()
@@ -83,11 +89,15 @@ func (graph *GraphLLB) buildBaseImages() {
 		constants.DefaultBaseImage,
 		llb.WithCustomName(graph.Options.CommonPrefix+"base"),
 	).Run(
-		llb.Shlex("apk --no-cache --update add bash"),
-		llb.WithCustomName(graph.Options.CommonPrefix+"base-apkinstall"),
+		append(graph.commonRunOptions,
+			llb.Shlex("apk --no-cache --update add bash"),
+			llb.WithCustomName(graph.Options.CommonPrefix+"base-apkinstall"),
+		)...,
 	).Run(
-		llb.Args([]string{"ln", "-svf", "/bin/bash", "/bin/sh"}),
-		llb.WithCustomName(graph.Options.CommonPrefix+"base-symlink"),
+		append(graph.commonRunOptions,
+			llb.Args([]string{"ln", "-svf", "/bin/bash", "/bin/sh"}),
+			llb.WithCustomName(graph.Options.CommonPrefix+"base-symlink"),
+		)...,
 	).Root())
 
 	graph.BaseImages[v1alpha2.Scratch] = graph.baseImageProcessor(llb.Scratch())
@@ -98,8 +108,10 @@ func (graph *GraphLLB) buildChecksummer() {
 		constants.DefaultBaseImage,
 		llb.WithCustomName(graph.Options.CommonPrefix+"cksum"),
 	).Run(
-		llb.Shlex("apk --no-cache --update add coreutils"),
-		llb.WithCustomName(graph.Options.CommonPrefix+"cksum-apkinstall"),
+		append(graph.commonRunOptions,
+			llb.Shlex("apk --no-cache --update add coreutils"),
+			llb.WithCustomName(graph.Options.CommonPrefix+"cksum-apkinstall"),
+		)...,
 	).Root()
 }
 

internal/pkg/convert/node.go

@@ -64,9 +64,11 @@ func (node *NodeLLB) base() (llb.State, error) {
 func (node *NodeLLB) install(root llb.State) llb.State {
 	if len(node.Pkg.Install) > 0 {
 		root = root.Run(
-			llb.Args(
-				append([]string{"/sbin/apk", "add", "--no-cache"}, node.Pkg.Install...)),
-			llb.WithCustomName(node.Prefix+"apk-install"),
+			append(node.Graph.commonRunOptions,
+				llb.Args(
+					append([]string{"/sbin/apk", "add", "--no-cache"}, node.Pkg.Install...)),
+				llb.WithCustomName(node.Prefix+"apk-install"),
+			)...,
 		).Root()
 	}
 
@@ -168,8 +170,10 @@ func (node *NodeLLB) stepDownload(root llb.State, step v1alpha2.Step) llb.State
 				Mkdir("/empty", constants.DefaultDirMode),
 			llb.WithCustomName(node.Prefix+"cksum-prepare"),
 		).Run(
-			llb.Shlex("sha512sum -c --strict /checksums"),
-			llb.WithCustomName(node.Prefix+"cksum-verify"),
+			append(node.Graph.commonRunOptions,
+				llb.Shlex("sha512sum -c --strict /checksums"),
+				llb.WithCustomName(node.Prefix+"cksum-verify"),
+			)...,
 		).Root()
 
 		root = root.File(
@@ -211,12 +215,14 @@ func (node *NodeLLB) stepScripts(root llb.State, i int, step v1alpha2.Step) llb.
 	} {
 		for _, instruction := range script.Instructions {
 			root = root.Run(
-				llb.Args([]string{
-					node.Pkg.Shell.Get(),
-					"-c",
-					instruction.Script(),
-				}),
-				llb.WithCustomName(fmt.Sprintf("%s%s-%d", node.Prefix, script.Desc, i)),
+				append(node.Graph.commonRunOptions,
+					llb.Args([]string{
+						node.Pkg.Shell.Get(),
+						"-c",
+						instruction.Script(),
+					}),
+					llb.WithCustomName(fmt.Sprintf("%s%s-%d", node.Prefix, script.Desc, i)),
+				)...,
 			).Root()
 		}
 	}

internal/pkg/environment/options.go

@@ -4,14 +4,19 @@
 
 package environment
 
-import "github.com/talos-systems/bldr/internal/pkg/types"
+import (
+	"github.com/moby/buildkit/client/llb"
+
+	"github.com/talos-systems/bldr/internal/pkg/types"
+)
 
 // Options for bldr.
 type Options struct {
 	BuildPlatform  Platform
 	TargetPlatform Platform
 	Target         string
 	CommonPrefix   string
+	ProxyEnv       *llb.ProxyEnv
 }
 
 // GetVariables returns set of variables set for options.

internal/pkg/pkgfile/build.go

@@ -30,6 +30,8 @@ const (
 	keyTargetPlatform = "platform"
 	keyMultiPlatform  = "multi-platform"
 
+	buildArgPrefix = "build-arg:"
+
 	localNameDockerfile = "dockerfile"
 	sharedKeyHint       = constants.PkgYaml
 )
@@ -39,7 +41,9 @@ const (
 //nolint:gocyclo
 func Build(ctx context.Context, c client.Client, options *environment.Options) (*client.Result, error) {
 	opts := c.BuildOpts().Opts
+
 	options.Target = opts[keyTarget]
+	options.ProxyEnv = proxyEnvFromBuildArgs(filter(opts, buildArgPrefix))
 
 	platforms := []environment.Platform{options.TargetPlatform}
 
@@ -213,3 +217,48 @@ func fetchPkgs(ctx context.Context, c client.Client) (client.Reference, error) {
 
 	return res.SingleRef()
 }
+
+func proxyEnvFromBuildArgs(args map[string]string) *llb.ProxyEnv {
+	pe := &llb.ProxyEnv{}
+	isNil := true
+
+	for k, v := range args {
+		if strings.EqualFold(k, "http_proxy") {
+			pe.HTTPProxy = v
+			isNil = false
+		}
+
+		if strings.EqualFold(k, "https_proxy") {
+			pe.HTTPSProxy = v
+			isNil = false
+		}
+
+		if strings.EqualFold(k, "ftp_proxy") {
+			pe.FTPProxy = v
+			isNil = false
+		}
+
+		if strings.EqualFold(k, "no_proxy") {
+			pe.NoProxy = v
+			isNil = false
+		}
+	}
+
+	if isNil {
+		return nil
+	}
+
+	return pe
+}
+
+func filter(opt map[string]string, key string) map[string]string {
+	m := map[string]string{}
+
+	for k, v := range opt {
+		if strings.HasPrefix(k, key) {
+			m[strings.TrimPrefix(k, key)] = v
+		}
+	}
+
+	return m
+}