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/pods | |
| 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/pods')
| -rw-r--r-- | cmd/podman/pods/create.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index d30f4782a..1f8152f32 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -17,6 +17,7 @@ import ( "github.com/containers/podman/v4/cmd/podman/containers" "github.com/containers/podman/v4/cmd/podman/parse" "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/errorhandling" @@ -26,7 +27,6 @@ import ( "github.com/docker/docker/pkg/parsers" "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/spf13/pflag" ) var ( @@ -99,14 +99,7 @@ func init() { shareParentFlagName := "share-parent" flags.BoolVar(&shareParent, shareParentFlagName, true, "Set the pod's cgroup as the cgroup parent for all containers joining the pod") - flags.SetNormalizeFunc(aliasNetworkFlag) -} - -func aliasNetworkFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName { - if name == "net" { - name = "network" - } - return pflag.NormalizedName(name) + flags.SetNormalizeFunc(utils.AliasFlags) } func create(cmd *cobra.Command, args []string) error { |