Quellcode durchsuchen

Merge pull request #42318 from thaJeztah/add_all_proxy

builder/dockerfile: add "ALL_PROXY" to list of default build args
Akihiro Suda vor 4 Jahren
Ursprung
Commit
e42a32e4f0
2 geänderte Dateien mit 4 neuen und 0 gelöschten Zeilen
  1. 2 0
      builder/dockerfile/buildargs.go
  2. 2 0
      builder/dockerfile/buildargs_test.go

+ 2 - 0
builder/dockerfile/buildargs.go

@@ -19,6 +19,8 @@ var builtinAllowedBuildArgs = map[string]bool{
 	"ftp_proxy":   true,
 	"NO_PROXY":    true,
 	"no_proxy":    true,
+	"ALL_PROXY":   true,
+	"all_proxy":   true,
 }
 
 // BuildArgs manages arguments used by the builder

+ 2 - 0
builder/dockerfile/buildargs_test.go

@@ -19,6 +19,7 @@ func TestGetAllAllowed(t *testing.T) {
 		"ArgOverriddenByOptions":              strPtr("fromopt2"),
 		"ArgNoDefaultInDockerfileFromOptions": strPtr("fromopt3"),
 		"HTTP_PROXY":                          strPtr("theproxy"),
+		"all_proxy":                           strPtr("theproxy2"),
 	})
 
 	buildArgs.AddMetaArg("ArgFromMeta", strPtr("frommeta1"))
@@ -35,6 +36,7 @@ func TestGetAllAllowed(t *testing.T) {
 	all := buildArgs.GetAllAllowed()
 	expected := map[string]string{
 		"HTTP_PROXY":                          "theproxy",
+		"all_proxy":                           "theproxy2",
 		"ArgOverriddenByOptions":              "fromopt2",
 		"ArgWithDefaultInDockerfile":          "fromdockerfile1",
 		"ArgNoDefaultInDockerfileFromOptions": "fromopt3",