summaryrefslogtreecommitdiff
path: root/libpod/container.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-10-02 13:34:58 -0400
committerMatthew Heon <matthew.heon@gmail.com>2018-10-11 11:10:23 -0400
commit5c5163107cb31d83eb6cd05427e818182c1f6112 (patch)
treeb91346bb9b50a776af5a551e2ea52dddc24ca314 /libpod/container.go
parent6b80986194c0ec525775e24d7fa973cd5c067ed0 (diff)
downloadpodman-5c5163107cb31d83eb6cd05427e818182c1f6112.tar.gz
podman-5c5163107cb31d83eb6cd05427e818182c1f6112.tar.bz2
podman-5c5163107cb31d83eb6cd05427e818182c1f6112.zip
Temporary commit to swap branches
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod/container.go')
-rw-r--r--libpod/container.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/libpod/container.go b/libpod/container.go
index 55a0f3a2c..5997c0b66 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -269,9 +269,13 @@ type ContainerConfig struct {
// Network Config
// CreateNetNS indicates that libpod should create and configure a new
- // network namespace for the container
- // This cannot be set if NetNsCtr is also set
+ // network namespace for the container.
+ // This cannot be set if NetNsCtr is also set.
CreateNetNS bool `json:"createNetNS"`
+ // StaticIP is a static IP to request for the container.
+ // This cannot be set unless CreateNetNS is set.
+ // If not set, the container will be dynamically assigned an IP by CNI.
+ StaticIP net.IP `json:"staticIP"`
// PortMappings are the ports forwarded to the container's network
// namespace
// These are not used unless CreateNetNS is true