diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-01 05:48:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 05:48:17 -0400 |
| commit | c0dac6c5f34312f136e0a061b905d7cbc2350fa6 (patch) | |
| tree | 749c64ebd669cac713514751703e78d31792025a /pkg/bindings/images | |
| parent | c70f5fb19bb411f81183d025d18bbf1e8cdc0938 (diff) | |
| parent | fad55e47307f9d7aeadfd0e11f4374afd7b0e061 (diff) | |
| download | podman-c0dac6c5f34312f136e0a061b905d7cbc2350fa6.tar.gz podman-c0dac6c5f34312f136e0a061b905d7cbc2350fa6.tar.bz2 podman-c0dac6c5f34312f136e0a061b905d7cbc2350fa6.zip | |
Merge pull request #7858 from jwhonce/wip/http_proxy
Support --http-proxy for remote builds
Diffstat (limited to 'pkg/bindings/images')
| -rw-r--r-- | pkg/bindings/images/build.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 9082670a7..e65a04f7b 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -60,7 +60,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO params.Set("cpushares", strconv.Itoa(int(cpuShares))) } if cpuSetCpus := options.CommonBuildOpts.CPUSetCPUs; len(cpuSetCpus) > 0 { - params.Set("cpusetcpues", cpuSetCpus) + params.Set("cpusetcpus", cpuSetCpus) } if cpuPeriod := options.CommonBuildOpts.CPUPeriod; cpuPeriod > 0 { params.Set("cpuperiod", strconv.Itoa(int(cpuPeriod))) @@ -92,6 +92,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO } params.Set("labels", l) } + if options.CommonBuildOpts.HTTPProxy { + params.Set("httpproxy", "1") + } stdout := io.Writer(os.Stdout) if options.Out != nil { |