rebump

Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940 Component: engine
2013-06-10 21:05:54 +00:00
parent a5e3ae8f4a 032df4df5a
commit 2bcee3140c
54 changed files with 1042 additions and 1053 deletions
@@ -564,7 +564,7 @@ Create an image
 	   Content-Type: application/json

 	   {"status":"Pulling..."}
-	   {"progress":"1/? (n/a)"}
+	   {"status":"Pulling", "progress":"1/? (n/a)"}
 	   {"error":"Invalid..."}
 	   ...

@@ -607,7 +607,7 @@ Insert a file in a image
 	   Content-Type: application/json

 	   {"status":"Inserting..."}
-	   {"progress":"1/? (n/a)"}
+	   {"status":"Inserting", "progress":"1/? (n/a)"}
 	   {"error":"Invalid..."}
 	   ...

@@ -734,7 +734,7 @@ Push an image on the registry
 	   Content-Type: application/json

 	   {"status":"Pushing..."}
-	   {"progress":"1/? (n/a)"}
+	   {"status":"Pushing", "progress":"1/? (n/a)"}
 	   {"error":"Invalid..."}
 	   ...

@@ -974,10 +974,12 @@ Display system-wide information

 	   {
 		"Containers":11,
-		"Version":"0.2.2",
 		"Images":16,
-		"GoVersion":"go1.0.3",
-		"Debug":false
+		"Debug":false,
+		"NFd": 11,
+		"NGoroutines":21,
+		"MemoryLimit":true,
+		"SwapLimit":false
 	   }

        :statuscode 200: no error
@@ -1003,12 +1005,11 @@ Show the docker version information

           HTTP/1.1 200 OK
 	   Content-Type: application/json
-	   
+
 	   {
 		"Version":"0.2.2",
 		"GitCommit":"5a2a5cc+CHANGES",
-		"MemoryLimit":true,
-		"SwapLimit":false
+		"GoVersion":"go1.0.3"
 	   }

        :statuscode 200: no error
@@ -5,5 +5,5 @@
 Contributing to Docker
 ======================

-Want to hack on Docker? Awesome! The repository includes `all the instructions you need to get started <https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md>`.
+Want to hack on Docker? Awesome! The repository includes `all the instructions you need to get started <https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md>`_.

@@ -5,11 +5,35 @@
 Setting Up a Dev Environment
 ============================

-Instructions that have been verified to work on Ubuntu 12.10,
+Instructions that have been verified to work on Ubuntu Precise 12.04 (LTS) (64-bit),
+
+
+Dependencies
+------------
+
+**Linux kernel 3.8**
+
+Due to a bug in LXC docker works best on the 3.8 kernel. Precise comes with a 3.2 kernel, so we need to upgrade it. The kernel we install comes with AUFS built in.
+

 .. code-block:: bash

-    sudo apt-get -y install lxc wget bsdtar curl golang git
+   # install the backported kernel
+   sudo apt-get update && sudo apt-get install linux-image-generic-lts-raring
+
+   # reboot
+   sudo reboot
+
+
+Installation
+------------
+
+.. code-block:: bash
+		
+    sudo apt-get install python-software-properties
+    sudo add-apt-repository ppa:gophers/go
+    sudo apt-get update
+    sudo apt-get -y install lxc wget bsdtar curl golang-stable git

    export GOPATH=~/go/
    export PATH=$GOPATH/bin:$PATH
@@ -19,7 +19,8 @@ Most frequently asked questions.

 3. **Does Docker run on Mac OS X or Windows?**

-   Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a virtual machine on your box, and get the best of both worlds. Check out the MacOSX_ and Windows_ installation guides.
+   Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a
+   virtual machine on your box, and get the best of both worlds. Check out the :ref:`install_using_vagrant` and :ref:`windows` installation guides.

 4. **How do containers compare to virtual machines?**

@@ -34,15 +35,16 @@ Most frequently asked questions.

    You can find more answers on:

-    * `IRC: docker on freenode`_
+    * `Docker club mailinglist`_
+    * `IRC, docker on freenode`_
    * `Github`_
    * `Ask questions on Stackoverflow`_
    * `Join the conversation on Twitter`_

-    .. _Windows: ../installation/windows/
-    .. _MacOSX: ../installation/vagrant/
+
+    .. _Docker club mailinglist: https://groups.google.com/d/forum/docker-club
    .. _the repo: http://www.github.com/dotcloud/docker
-    .. _IRC\: docker on freenode: irc://chat.freenode.net#docker
+    .. _IRC, docker on freenode: irc://chat.freenode.net#docker
    .. _Github: http://www.github.com/dotcloud/docker
    .. _Ask questions on Stackoverflow: http://stackoverflow.com/search?q=docker
    .. _Join the conversation on Twitter: http://twitter.com/getdocker
@@ -92,6 +92,16 @@ have AUFS filesystem support enabled, so we need to install it.
   sudo apt-get update
   sudo apt-get install linux-image-extra-`uname -r`

+**add-apt-repository support**
+
+Some installations of Ubuntu 13.04 require ``software-properties-common`` to be
+installed before being able to use add-apt-repository.
+
+.. code-block:: bash
+
+  sudo apt-get install software-properties-common
+
+
 Installation
 ------------

@@ -2,6 +2,7 @@
 :description: Docker's tutorial to run docker on Windows
 :keywords: Docker, Docker documentation, Windows, requirements, virtualbox, vagrant, git, ssh, putty, cygwin

+.. _windows:

 Using Vagrant (Windows)
 =======================
@@ -18,7 +18,7 @@ steps and commit them along the way, giving you a final image.
 To use Docker Builder, assemble the steps into a text file (commonly referred to
 as a Dockerfile) and supply this to `docker build` on STDIN, like so:

-    ``docker build < Dockerfile``
+    ``docker build - < Dockerfile``

 Docker will run your steps one-by-one, committing the result if necessary, 
 before finally outputting the ID of your new image.