opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16776 from Luap99/http-proxy

Browse Source 
remote: allow --http-proxy for remote clients
This commit is contained in:
OpenShift Merge Robot
2022-12-09 05:23:38 -05:00
committed by GitHub
parent 205cb50250 2dde30b93a
commit 859f40a2eb
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/podman/common/create.go
View File

@ -621,7 +621,6 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
if registry.IsRemote() {
_ = createFlags.MarkHidden("env-host")
_ = createFlags.MarkHidden("http-proxy")
_ = createFlags.MarkHidden(decryptionKeysFlagName)
} else {
createFlags.StringVar(

11
cmd/podman/images/build.go
View File

@ -168,16 +168,7 @@ func buildFlags(cmd *cobra.Command) {
logrus.Errorf("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()