diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-10 19:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 19:10:59 +0100 |
| commit | ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4 (patch) | |
| tree | 687c943d5ed8e7548f6c7f3888b701f99a33cde1 /cmd/podman/common/create_opts.go | |
| parent | da01191aa3526e3a77d9a055e23c318c26720785 (diff) | |
| parent | b7b5b6f8e3072530f4c3fc07e5960e54c90729b5 (diff) | |
| download | podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.gz podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.bz2 podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.zip | |
Merge pull request #8251 from baude/networkaliases
network aliases for container creation
Diffstat (limited to 'cmd/podman/common/create_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 8b2efc988..4b52663c3 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -133,6 +133,7 @@ func stringMaptoArray(m map[string]string) []string { // a specgen spec. func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroupsManager string) (*ContainerCLIOpts, []string, error) { var ( + aliases []string capAdd []string cappDrop []string entrypoint string @@ -242,8 +243,11 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup // network names endpointsConfig := cc.NetworkingConfig.EndpointsConfig cniNetworks := make([]string, 0, len(endpointsConfig)) - for netName := range endpointsConfig { + for netName, endpoint := range endpointsConfig { cniNetworks = append(cniNetworks, netName) + if len(endpoint.Aliases) > 0 { + aliases = append(aliases, endpoint.Aliases...) + } } // netMode @@ -262,6 +266,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup // defined when there is only one network. netInfo := entities.NetOptions{ AddHosts: cc.HostConfig.ExtraHosts, + Aliases: aliases, CNINetworks: cniNetworks, DNSOptions: cc.HostConfig.DNSOptions, DNSSearch: cc.HostConfig.DNSSearch, |