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 /libpod/network | |
| 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 'libpod/network')
| -rw-r--r-- | libpod/network/config.go | 5 | ||||
| -rw-r--r-- | libpod/network/netconflist.go | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libpod/network/config.go b/libpod/network/config.go index a08e684d8..ce8a4446c 100644 --- a/libpod/network/config.go +++ b/libpod/network/config.go @@ -131,8 +131,9 @@ func (f FirewallConfig) Bytes() ([]byte, error) { // DNSNameConfig describes the dns container name resolution plugin config type DNSNameConfig struct { - PluginType string `json:"type"` - DomainName string `json:"domainName"` + PluginType string `json:"type"` + DomainName string `json:"domainName"` + Capabilities map[string]bool `json:"capabilities"` } // Bytes outputs the configuration as []byte diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go index b95980529..111f1715c 100644 --- a/libpod/network/netconflist.go +++ b/libpod/network/netconflist.go @@ -122,9 +122,12 @@ func NewFirewallPlugin() FirewallConfig { // NewDNSNamePlugin creates the dnsname config with a given // domainname func NewDNSNamePlugin(domainName string) DNSNameConfig { + caps := make(map[string]bool, 1) + caps["aliases"] = true return DNSNameConfig{ - PluginType: "dnsname", - DomainName: domainName, + PluginType: "dnsname", + DomainName: domainName, + Capabilities: caps, } } |