diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-28 10:03:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 10:03:17 -0400 |
| commit | 2d22d17066aae4c357aff7015220cd4095d996f8 (patch) | |
| tree | 153f1cb64bd9bbf913ac3c45f32605d44c4298e5 /pkg | |
| parent | cc23e059d9537360d0eb4c16c4f0598efd8ecb0d (diff) | |
| parent | 1c8926285d1ecdfe201fe68896657573dcdc22b7 (diff) | |
| download | podman-2d22d17066aae4c357aff7015220cd4095d996f8.tar.gz podman-2d22d17066aae4c357aff7015220cd4095d996f8.tar.bz2 podman-2d22d17066aae4c357aff7015220cd4095d996f8.zip | |
Merge pull request #11751 from Luap99/net-alias
always add short container id as net alias
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index fefa9b4a9..b6263332e 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -498,6 +498,7 @@ func CreateExitCommandArgs(storageConfig types.StoreOptions, config *config.Conf "--log-level", logrus.GetLevel().String(), "--cgroup-manager", config.Engine.CgroupManager, "--tmpdir", config.Engine.TmpDir, + "--cni-config-dir", config.Network.NetworkConfigDir, } if config.Engine.OCIRuntime != "" { command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...) |