diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-16 17:24:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-16 17:24:34 +0200 |
| commit | a9a1345cb02db1a34cb248221fb06ff523c1e25c (patch) | |
| tree | 3f088b2c4582fbe3eb812e7da63b6f551fb04e73 /cmd/podman/common/netflags.go | |
| parent | 4823c1b3f675c0f370b21d14ec437ce55300e97d (diff) | |
| parent | 21841dc381f252d447a00e2d4ca5082a5e80d0f7 (diff) | |
| download | podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.gz podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.tar.bz2 podman-a9a1345cb02db1a34cb248221fb06ff523c1e25c.zip | |
Merge pull request #15823 from rhatdan/dns-opt
Default to --dns-option to match Docker and Buildah
Diffstat (limited to 'cmd/podman/common/netflags.go')
| -rw-r--r-- | cmd/podman/common/netflags.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 90f05ab15..081914017 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -33,18 +33,12 @@ func DefineNetFlags(cmd *cobra.Command) { ) _ = cmd.RegisterFlagCompletionFunc(dnsFlagName, completion.AutocompleteNone) - dnsOptFlagName := "dns-opt" + dnsOptFlagName := "dns-option" netFlags.StringSlice( dnsOptFlagName, containerConfig.DNSOptions(), "Set custom DNS options", ) _ = cmd.RegisterFlagCompletionFunc(dnsOptFlagName, completion.AutocompleteNone) - netFlags.StringSlice( - "dns-option", containerConfig.DNSOptions(), - "Docker compatibility option== --dns-opt", - ) - _ = netFlags.MarkHidden("dns-option") - dnsSearchFlagName := "dns-search" netFlags.StringSlice( dnsSearchFlagName, containerConfig.DNSSearches(), @@ -143,20 +137,12 @@ func NetFlagsToNetOptions(opts *entities.NetOptions, flags pflag.FlagSet) (*enti } } - if flags.Changed("dns-opt") { - options, err := flags.GetStringSlice("dns-opt") - if err != nil { - return nil, err - } - opts.DNSOptions = options - } - if flags.Changed("dns-option") { options, err := flags.GetStringSlice("dns-option") if err != nil { return nil, err } - opts.DNSOptions = append(opts.DNSOptions, options...) + opts.DNSOptions = options } if flags.Changed("dns-search") { |