summaryrefslogtreecommitdiff
path: root/cmd/podman/common/specgen.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-10 19:10:59 +0100
committerGitHub <noreply@github.com>2020-11-10 19:10:59 +0100
commitce2ac7d2d2413074f9855acbaa7be0b4d5d726e4 (patch)
tree687c943d5ed8e7548f6c7f3888b701f99a33cde1 /cmd/podman/common/specgen.go
parentda01191aa3526e3a77d9a055e23c318c26720785 (diff)
parentb7b5b6f8e3072530f4c3fc07e5960e54c90729b5 (diff)
downloadpodman-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/specgen.go')
-rw-r--r--cmd/podman/common/specgen.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index ca1e25be1..39ff02857 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -396,6 +396,17 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.ShmSize = &shmSize
}
s.CNINetworks = c.Net.CNINetworks
+
+ // Network aliases
+ if len(c.Net.Aliases) > 0 {
+ // build a map of aliases where key=cniName
+ aliases := make(map[string][]string, len(s.CNINetworks))
+ for _, cniNetwork := range s.CNINetworks {
+ aliases[cniNetwork] = c.Net.Aliases
+ }
+ s.Aliases = aliases
+ }
+
s.HostAdd = c.Net.AddHosts
s.UseImageResolvConf = c.Net.UseImageResolvConf
s.DNSServers = c.Net.DNSServers