From ff10ab55d22b5c53c1eefe3ab257e8ea56c04494 Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Thu, 13 Mar 2014 15:18:08 -0700
Subject: [PATCH] Update libcontainer readme and todo list
 Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com>
 (github: crosbymichael)

---
 libcontainer/README.md | 119 ++++++++++++++++++++++++-----------------
 libcontainer/TODO.md   |   8 +--
 2 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/libcontainer/README.md b/libcontainer/README.md
index d6e4ded..2c85111 100644
--- a/libcontainer/README.md
+++ b/libcontainer/README.md
@@ -16,54 +16,77 @@ process are specified in this file.  The configuration is used for each process
 Sample `container.json` file:
 ```json
 {
-    "hostname": "koye",
-    "tty": true,
-    "environment": [
-        "HOME=/",
-        "PATH=PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin",
-        "container=docker",
-        "TERM=xterm-256color"
-    ],
-    "namespaces": [
-        "NEWIPC",
-        "NEWNS",
-        "NEWPID",
-        "NEWUTS",
-        "NEWNET"
-    ],
-    "capabilities": [
-        "SETPCAP",
-        "SYS_MODULE",
-        "SYS_RAWIO",
-        "SYS_PACCT",
-        "SYS_ADMIN",
-        "SYS_NICE",
-        "SYS_RESOURCE",
-        "SYS_TIME",
-        "SYS_TTY_CONFIG",
-        "MKNOD",
-        "AUDIT_WRITE",
-        "AUDIT_CONTROL",
-        "MAC_OVERRIDE",
-        "MAC_ADMIN",
-        "NET_ADMIN"
-    ],
-    "networks": [{
-            "type": "veth",
-            "context": {
-                "bridge": "docker0",
-                "prefix": "dock"
-            },
-            "address": "172.17.0.100/16",
-            "gateway": "172.17.42.1",
-            "mtu": 1500
-        }
-    ],
-    "cgroups": {
-        "name": "docker-koye",
-        "parent": "docker",
-        "memory": 5248000
-    }
+   "hostname" : "koye",
+   "networks" : [
+      {
+         "gateway" : "172.17.42.1",
+         "context" : {
+            "bridge" : "docker0",
+            "prefix" : "veth"
+         },
+         "address" : "172.17.0.2/16",
+         "type" : "veth",
+         "mtu" : 1500
+      }
+   ],
+   "cgroups" : {
+      "parent" : "docker",
+      "name" : "11bb30683fb0bdd57fab4d3a8238877f1e4395a2cfc7320ea359f7a02c1a5620"
+   },
+   "tty" : true,
+   "environment" : [
+      "HOME=/",
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+      "HOSTNAME=11bb30683fb0",
+      "TERM=xterm"
+   ],
+   "capabilities" : [
+      "SETPCAP",
+      "SYS_MODULE",
+      "SYS_RAWIO",
+      "SYS_PACCT",
+      "SYS_ADMIN",
+      "SYS_NICE",
+      "SYS_RESOURCE",
+      "SYS_TIME",
+      "SYS_TTY_CONFIG",
+      "MKNOD",
+      "AUDIT_WRITE",
+      "AUDIT_CONTROL",
+      "MAC_OVERRIDE",
+      "MAC_ADMIN",
+      "NET_ADMIN"
+   ],
+   "context" : {
+      "apparmor_profile" : "docker-default"
+   },
+   "mounts" : [
+      {
+         "source" : "/var/lib/docker/containers/11bb30683fb0bdd57fab4d3a8238877f1e4395a2cfc7320ea359f7a02c1a5620/resolv.conf",
+         "writable" : false,
+         "destination" : "/etc/resolv.conf",
+         "private" : true
+      },
+      {
+         "source" : "/var/lib/docker/containers/11bb30683fb0bdd57fab4d3a8238877f1e4395a2cfc7320ea359f7a02c1a5620/hostname",
+         "writable" : false,
+         "destination" : "/etc/hostname",
+         "private" : true
+      },
+      {
+         "source" : "/var/lib/docker/containers/11bb30683fb0bdd57fab4d3a8238877f1e4395a2cfc7320ea359f7a02c1a5620/hosts",
+         "writable" : false,
+         "destination" : "/etc/hosts",
+         "private" : true
+      }
+   ],
+   "namespaces" : [
+      "NEWNS",
+      "NEWUTS",
+      "NEWIPC",
+      "NEWPID",
+      "NEWNET"
+   ]
 }
 ```
 
diff --git a/libcontainer/TODO.md b/libcontainer/TODO.md
index f18c0b4..87224db 100644
--- a/libcontainer/TODO.md
+++ b/libcontainer/TODO.md
@@ -1,17 +1,11 @@
 #### goals
 * small and simple - line count is not everything but less code is better
-* clean lines between what we do in the pkg 
 * provide primitives for working with namespaces not cater to every option
 * extend via configuration not by features - host networking, no networking, veth network can be accomplished via adjusting the container.json, nothing to do with code
 
 #### tasks
-* proper tty for a new process in an existing container
-* use exec or raw syscalls for new process in existing container
-* setup proper user in namespace if specified
-* implement hook or clean interface for cgroups
+* reexec or raw syscalls for new process in existing container
 * example configs for different setups (host networking, boot init)
 * improve pkg documentation with comments
 * testing - this is hard in a low level pkg but we could do some, maybe
-* pivot root
 * selinux
-* apparmor