diff --git a/README.md b/README.md index bb69f47979..273291250f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Docker complements LXC with a high-level API which operates at the process level Docker is a great building block for automating distributed systems: large-scale web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc. ![Docker L](docs/sources/static_files/lego_docker.jpg "Docker") +======= * *Heterogeneous payloads*: any combination of binaries, libraries, configuration files, scripts, virtualenvs, jars, gems, tarballs, you name it. No more juggling between domain-specific tools. Docker can deploy and run them all. diff --git a/docs/sources/examples/hello_world_daemon.rst b/docs/sources/examples/hello_world_daemon.rst index 6ced505f1d..f9c71fbacb 100644 --- a/docs/sources/examples/hello_world_daemon.rst +++ b/docs/sources/examples/hello_world_daemon.rst @@ -16,7 +16,7 @@ out every second. It will continue to do this until we stop it. .. code-block:: bash - $ CONTAINER_ID=$(docker run -d base /bin/sh -c "while true; do echo hello world; sleep 1; done") + CONTAINER_ID=$(docker run -d base /bin/sh -c "while true; do echo hello world; sleep 1; done") We are going to run a simple hello world daemon in a new container made from the busybox daemon. @@ -28,7 +28,7 @@ We are going to run a simple hello world daemon in a new container made from the .. code-block:: bash - $ docker logs $CONTAINER_ID + docker logs $CONTAINER_ID Check the logs make sure it is working correctly. @@ -54,7 +54,7 @@ Check the process list to make sure it is running. .. code-block:: bash - $ docker stop $CONTAINER_ID + docker stop $CONTAINER_ID Stop the container, since we don't need it anymore. diff --git a/docs/sources/examples/python_web_app.rst b/docs/sources/examples/python_web_app.rst index 9e41073310..978c6de1c4 100644 --- a/docs/sources/examples/python_web_app.rst +++ b/docs/sources/examples/python_web_app.rst @@ -12,44 +12,44 @@ The goal of this example is to show you how you can author your own docker image .. code-block:: bash - $ docker pull shykes/pybuilder + docker pull shykes/pybuilder We are downloading the "shykes/pybuilder" docker image .. code-block:: bash - $ URL=http://github.com/shykes/helloflask/archive/master.tar.gz + URL=http://github.com/shykes/helloflask/archive/master.tar.gz We set a URL variable that points to a tarball of a simple helloflask web app .. code-block:: bash - $ BUILD_JOB=$(docker run -d -t shykes/pybuilder:latest /usr/local/bin/buildapp $URL) + BUILD_JOB=$(docker run -d -t shykes/pybuilder:latest /usr/local/bin/buildapp $URL) Inside of the "shykes/pybuilder" image there is a command called buildapp, we are running that command and passing the $URL variable from step 2 to it, and running the whole thing inside of a new container. BUILD_JOB will be set with the new container_id. .. code-block:: bash - $ docker attach $BUILD_JOB + docker attach $BUILD_JOB [...] We attach to the new container to see what is going on. Ctrl-C to disconnect .. code-block:: bash - $ BUILD_IMG=$(docker commit $BUILD_JOB _/builds/github.com/hykes/helloflask/master) + BUILD_IMG=$(docker commit $BUILD_JOB _/builds/github.com/hykes/helloflask/master) Save the changed we just made in the container to a new image called "_/builds/github.com/hykes/helloflask/master" and save the image id in the BUILD_IMG variable name. .. code-block:: bash - $ WEB_WORKER=$(docker run -d -p 5000 $BUILD_IMG /usr/local/bin/runapp) + WEB_WORKER=$(docker run -d -p 5000 $BUILD_IMG /usr/local/bin/runapp) Use the new image we just created and create a new container with network port 5000, and return the container id and store in the WEB_WORKER variable. .. code-block:: bash - $ docker logs $WEB_WORKER + docker logs $WEB_WORKER * Running on http://0.0.0.0:5000/ view the logs for the new container using the WEB_WORKER variable, and if everything worked as planned you should see the line "Running on http://0.0.0.0:5000/" in the log output. diff --git a/docs/sources/gettingstarted/index.html b/docs/sources/gettingstarted/index.html index 48de374c1e..b86e9bbdd4 100644 --- a/docs/sources/gettingstarted/index.html +++ b/docs/sources/gettingstarted/index.html @@ -63,7 +63,7 @@
- Docker is still under heavy development. It should not yet be used in production. Check the repo for recent progress. + Docker is still under heavy development. It should not yet be used in production. Check the repo for recent progress.
@@ -76,8 +76,8 @@

Install dependencies:

- 
sudo apt-get install lxc wget bsdtar curl
- 
sudo apt-get install linux-image-extra-`uname -r`
+ 
sudo apt-get install lxc wget bsdtar curl
+ 
sudo apt-get install linux-image-extra-`uname -r`

The linux-image-extra package is needed on standard Ubuntu EC2 AMIs in order to install the aufs kernel module.

@@ -85,28 +85,28 @@

Install the latest docker binary:

- 
wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz
- 
tar -xf docker-master.tgz
+ 
wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz
+ 
tar -xf docker-master.tgz

  • Run your first container!

    cd docker-master
    - 
    sudo ./docker run -i -t base /bin/bash
    + 
    sudo ./docker run -i -t base /bin/bash

    Done!

    Consider adding docker to your PATH for simplicity.

    • - Continue with the Hello world example. + Continue with the Hello world example.

    Contributing to Docker

    -

    Want to hack on Docker? Awesome! We have some instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.

    +

    Want to hack on Docker? Awesome! We have some instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.

    @@ -117,8 +117,8 @@ vagrant and an Ubuntu virtual machine.

    diff --git a/docs/sources/index.html b/docs/sources/index.html index abbf9acfb5..1ba4184e28 100644 --- a/docs/sources/index.html +++ b/docs/sources/index.html @@ -87,7 +87,7 @@
    - Let's get started + Let's get started
    diff --git a/docs/sources/index.rst b/docs/sources/index.rst index 92efc113e0..cc21a69bf5 100644 --- a/docs/sources/index.rst +++ b/docs/sources/index.rst @@ -15,4 +15,7 @@ This documentation has the following resources: examples/index contributing/index commandline/index - faq \ No newline at end of file + faq + + +.. image:: http://www.docker.io/_static/lego_docker.jpg \ No newline at end of file