Merge pull request #1898 from dotcloud/smallfix_registry
Prevent panic upon error pulling registry
diff --git a/docs/sources/commandline/command/commit.rst b/docs/sources/commandline/command/commit.rst
index 64d7415..e1d5092 100644
--- a/docs/sources/commandline/command/commit.rst
+++ b/docs/sources/commandline/command/commit.rst
@@ -19,15 +19,31 @@
Full -run example::
- {"Hostname": "",
- "User": "",
- "CpuShares": 0,
- "Memory": 0,
- "MemorySwap": 0,
- "PortSpecs": ["22", "80", "443"],
- "Tty": true,
- "OpenStdin": true,
- "StdinOnce": true,
- "Env": ["FOO=BAR", "FOO2=BAR2"],
- "Cmd": ["cat", "-e", "/etc/resolv.conf"],
- "Dns": ["8.8.8.8", "8.8.4.4"]}
+{
+ "Entrypoint" : null,
+ "Privileged" : false,
+ "User" : "",
+ "VolumesFrom" : "",
+ "Cmd" : ["cat", "-e", "/etc/resolv.conf"],
+ "Dns" : ["8.8.8.8", "8.8.4.4"],
+ "MemorySwap" : 0,
+ "AttachStdin" : false,
+ "AttachStderr" : false,
+ "CpuShares" : 0,
+ "OpenStdin" : false,
+ "Volumes" : null,
+ "Hostname" : "122612f45831",
+ "PortSpecs" : ["22", "80", "443"],
+ "Image" : "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+ "Tty" : false,
+ "Env" : [
+ "HOME=/",
+ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ],
+ "StdinOnce" : false,
+ "Domainname" : "",
+ "WorkingDir" : "/",
+ "NetworkDisabled" : false,
+ "Memory" : 0,
+ "AttachStdout" : false
+}
diff --git a/docs/sources/faq.rst b/docs/sources/faq.rst
index dd5fd11..23460f4 100644
--- a/docs/sources/faq.rst
+++ b/docs/sources/faq.rst
@@ -122,6 +122,13 @@
(Jenkins, Strider, Travis), etc. Docker is rapidly establishing
itself as the standard for container-based tooling.
+Do I lose my data when the container exits?
+...........................................
+
+Not at all! Any data that your application writes to disk gets preserved
+in its container until you explicitly delete the container. The file
+system for the container persists even after the container halts.
+
Can I help by adding some questions and answers?
................................................
