github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2932 from garthy/support_http_proxy

Browse Source 
Support http proxy environment variables in linuxkit build
This commit is contained in:
Justin Cormack 2018-02-27 19:21:04 +00:00 committed by GitHub
commit cc137cfbf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmd/linuxkit/pkglib/docker.go
View File

@ -31,6 +31,15 @@ func isExecErrNotFound(err error) bool {
return eerr.Err == exec.ErrNotFound return eerr.Err == exec.ErrNotFound
} }
var proxyEnvVars = []string{
"http_proxy",
"https_proxy",
"no_proxy",
"HTTP_PROXY",
"HTTPS_PROXY",
"NO_PROXY",
}
func (dr dockerRunner) command(args ...string) error { func (dr dockerRunner) command(args ...string) error {
cmd := exec.Command("docker", args...) cmd := exec.Command("docker", args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
@ -43,6 +52,17 @@ func (dr dockerRunner) command(args ...string) error {
dct = dctEnableEnv + " " dct = dctEnableEnv + " "
} }
if args[0] == "build" {
buildArgs := []string{}
for _, proxyVarName := range proxyEnvVars {
if value, ok := os.LookupEnv(proxyVarName); ok {
buildArgs = append(buildArgs,
[]string{"--build-arg", fmt.Sprintf("%s=%s", proxyVarName, value)}...)
}
}
cmd.Args = append(append(cmd.Args[:2], buildArgs...), cmd.Args[2:]...)
}
log.Debugf("Executing: %s%v", dct, cmd.Args) log.Debugf("Executing: %s%v", dct, cmd.Args)
err := cmd.Run() err := cmd.Run()