diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-12 08:40:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 08:40:44 -0500 |
| commit | 64b86d004ebd7db0b2bc352475505050be0f8591 (patch) | |
| tree | cc0328d6d64b3ac15604c1da2c7a3ed71167c478 /cmd/podman | |
| parent | 5575c7be2023d0709432b12b60124168c6956c8a (diff) | |
| parent | 1c1e670d40826bed50ea43c197d1944018263738 (diff) | |
| download | podman-64b86d004ebd7db0b2bc352475505050be0f8591.tar.gz podman-64b86d004ebd7db0b2bc352475505050be0f8591.tar.bz2 podman-64b86d004ebd7db0b2bc352475505050be0f8591.zip | |
Merge pull request #8905 from rhatdan/proxy
Use HTTPProxy settings from containers.conf
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/images/build.go | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index bbd4f6bae..24703eda2 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -336,7 +336,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) { createFlags.BoolVar( &cf.HTTPProxy, - "http-proxy", true, + "http-proxy", containerConfig.Containers.HTTPProxy, "Set proxy environment variables in the container based on the host proxy vars", ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 3aca104e3..c0aa27ca1 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -135,6 +135,16 @@ func buildFlags(cmd *cobra.Command) { logrus.Errorf("error setting up build flags: %v", err) os.Exit(1) } + // --http-proxy flag + // containers.conf defaults to true but we want to force false by default for remote, since settings do not apply + if registry.IsRemote() { + flag = fromAndBudFlags.Lookup("http-proxy") + buildOpts.HTTPProxy = false + if err := flag.Value.Set("false"); err != nil { + logrus.Errorf("unable to set --https-proxy to %v: %v", false, err) + } + flag.DefValue = "false" + } flags.AddFlagSet(&fromAndBudFlags) // Add the completion functions fromAndBudFlagsCompletions := buildahCLI.GetFromAndBudFlagsCompletions() |