Merge pull request #6274 from userid0x0/cmdAdd_proxyFix

build,add: add support for corporate proxies

Author: openshift-merge-bot[bot]

add.go

@@ -156,7 +156,10 @@ func getURL(src string, chown *idtools.IDPair, mountpoint, renameTarget string,
 	}
 	tlsClientConfig.InsecureSkipVerify = insecureSkipTLSVerify == types.OptionalBoolTrue
 
-	tr := &http.Transport{TLSClientConfig: tlsClientConfig}
+	tr := &http.Transport{
+		TLSClientConfig: tlsClientConfig,
+		Proxy:           http.ProxyFromEnvironment,
+	}
 	httpClient := &http.Client{Transport: tr}
 	response, err := httpClient.Get(src)
 	if err != nil {

tests/bud.bats

@@ -7481,6 +7481,15 @@ _EOF
   fi
 }
 
+@test "build proxy - ADD URL" {
+  _prefetch alpine
+  target=alpine-image
+  http_proxy=http://127.0.0.1:47 HTTPS_PROXY=http://127.0.0.1:47 \
+    run_buildah 125 build $WITH_POLICY_JSON -t alpine-image -f $BUDFILES/add-checksum/Containerfile $BUDFILES/add-checksum
+  expect_output --substring "127.0.0.1:47" "connection to fake proxy must fail"
+  expect_output --substring "connection refused" "connection to fake proxy must fail"
+}
+
 @test "bud-with-mount-bind-from-like-buildkit" {
   skip_if_no_runtime
   skip_if_in_container