From 3cb698125da7b55a7d7ec43b33858f35844a6143 Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Thu, 20 Feb 2014 15:50:55 -0800
Subject: [PATCH] Change IP to address because it includes the subnet
 Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com>
 (github: crosbymichael)

---
 pkg/libcontainer/README.md      | 7 ++++++-
 pkg/libcontainer/container.go   | 2 +-
 pkg/libcontainer/container.json | 2 +-
 pkg/libcontainer/nsinit/init.go | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/libcontainer/README.md b/pkg/libcontainer/README.md
index 07fe4f7b2d..163161c178 100644
--- a/pkg/libcontainer/README.md
+++ b/pkg/libcontainer/README.md
@@ -47,10 +47,15 @@ Sample `container.json` file:
         "MAC_ADMIN"
     ],
     "network": {
-        "ip": "172.17.0.100/16",
+        "address": "172.17.0.100/16",
         "gateway": "172.17.42.1",
         "bridge": "docker0",
         "mtu": 1500
+    },
+    "cgroups": {
+        "name": "docker-koye",
+        "parent": "docker",
+        "memory": 524800
     }
 }
 ```
diff --git a/pkg/libcontainer/container.go b/pkg/libcontainer/container.go
index 4c0e39a798..e6e4b4747e 100644
--- a/pkg/libcontainer/container.go
+++ b/pkg/libcontainer/container.go
@@ -23,7 +23,7 @@ type Container struct {
 // The network configuration can be omited from a container causing the
 // container to be setup with the host's networking stack
 type Network struct {
-	IP      string `json:"ip,omitempty"`
+	Address string `json:"address,omitempty"`
 	Gateway string `json:"gateway,omitempty"`
 	Bridge  string `json:"bridge,omitempty"`
 	Mtu     int    `json:"mtu,omitempty"`
diff --git a/pkg/libcontainer/container.json b/pkg/libcontainer/container.json
index 2207543bd0..c1a07dc55b 100644
--- a/pkg/libcontainer/container.json
+++ b/pkg/libcontainer/container.json
@@ -30,7 +30,7 @@
         "MAC_ADMIN"
     ],
     "network": {
-        "ip": "172.17.0.100/16",
+        "address": "172.17.0.100/16",
         "gateway": "172.17.42.1",
         "bridge": "docker0",
         "mtu": 1500
diff --git a/pkg/libcontainer/nsinit/init.go b/pkg/libcontainer/nsinit/init.go
index f619276e60..f89e53982c 100644
--- a/pkg/libcontainer/nsinit/init.go
+++ b/pkg/libcontainer/nsinit/init.go
@@ -137,7 +137,7 @@ func setupVethNetwork(config *libcontainer.Network, tempVethName string) error {
 		if err := network.ChangeInterfaceName(tempVethName, "eth0"); err != nil {
 			return fmt.Errorf("change %s to eth0 %s", tempVethName, err)
 		}
-		if err := network.SetInterfaceIp("eth0", config.IP); err != nil {
+		if err := network.SetInterfaceIp("eth0", config.Address); err != nil {
 			return fmt.Errorf("set eth0 ip %s", err)
 		}
 		if err := network.SetMtu("eth0", config.Mtu); err != nil {