Merge remote-tracking branch 'dotcloud/docs'

2026-09-06 13:41:36 +00:00 · 2013-03-26 14:52:00 -07:00
parent 84df72222d 262be79041
commit 261003ceb0
12 changed files with 145 additions and 62 deletions
@@ -64,6 +64,11 @@ push:
 	@cd _build/html/ ; \
 	dotcloud push

+github-deploy: docs
+	rm -fr github-deploy
+	git clone ssh://git@github.com/dotcloud/docker github-deploy
+	cd github-deploy && git checkout -f gh-pages && git rm -r * && rsync -avH ../_build/html/ ./ && touch .nojekyll && echo "docker.io" > CNAME && git add * && git commit -m "Updating docs"
+
 $(VERSIONS):
 	@echo "Hello world"

@@ -61,3 +61,7 @@ Expose a service on a TCP port

  # Verify that the network connection worked
  echo "Daemon received: $(docker logs $JOB)"
+
+Continue to the complete `Command Line Interface`_
+
+.. _Command Line Interface: ../commandline/cli.html
@@ -6,7 +6,7 @@

 Building a python web app
 =========================
-The goal of this example is to show you how you can author your own docker images using a parent image, making changes to it, and then saving the results as a new image. We will do that by making a simple hello flask web application image. 
+The goal of this example is to show you how you can author your own docker images using a parent image, making changes to it, and then saving the results as a new image. We will do that by making a simple hello flask web application image.

 **Steps:**

@@ -64,3 +64,7 @@ See the example in action
    <div style="margin-top:10px;">
      <iframe width="720" height="350" src="http://ascii.io/a/2573/raw" frameborder="0"></iframe>
    </div>
+
+Continue to the `base commands`_
+
+.. _base commands: ../commandline/basecommands.html
@@ -3,27 +3,45 @@ FAQ


 Most frequently asked questions.
---------------------------------------------
+--------------------------------

-1. How much does Docker cost?
+**1. How much does Docker cost?**

 Docker is 100% free, it is open source, so you can use it without paying.

-2. What open source license are you using?
+**2. What open source license are you using?**

 We are using the Apache License Version 2.0, see it here: https://github.com/dotcloud/docker/blob/master/LICENSE

-3. Does Docker run on Mac OS X or Windows?
+**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 getting started guides for help on setting up your machine.
+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_ intallation guides.

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

-Containers are more light weight and can start in less then a second, and are great for lots of different tasks, but they aren't as full featured as virtual machines. 
+Containers are more light weight and can start in less then a second, and are great for lots of different tasks, but they aren't as full featured as virtual machines.

-5. Can I help by adding some questions and answers?
+**5. Can I help by adding some questions and answers?**

-Definitely! You can fork the repo and edit the documentation sources right there.
+Definitely! You can fork `the repo`_ and edit the documentation sources.
+
+
+**42. Where can I find more answers?**
+
+You can find more answers on:
+
+* `IRC: docker on freenode`_
+* `Github`_
+* `Ask questions on Stackoverflow`_
+* `Join the conversation on Twitter`_
+
+.. _Windows: ../documentation/installation/windows.html
+.. _MacOSX: ../documentation/installation/macos.html
+.. _the repo: http://www.github.com/dotcloud/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


 Looking for something else to read? Checkout the :ref:`hello_world` example.
@@ -62,13 +62,15 @@
 </div>

 <div class="container">
+    <div class="alert alert-info">
+	    <strong>Docker is still under heavy development.</strong> It should not yet be used in production. Check <a href="http://github.com/dotcloud/docker">the repo</a> for recent progress.
+    </div>
    <div class="row">
        <div class="span6">
            <section class="contentblock">
                <h2>
                    <a name="installing-on-ubuntu-1204-and-1210" class="anchor" href="#installing-on-ubuntu-1204-and-1210"><span class="mini-icon mini-icon-link"></span>
-                    </a>Installing on Ubuntu 12.04 and 12.10</h2>
-                    <p>Please note this project is currently under heavy development. It should not be used in production.</p>
+                    </a>Installing on Ubuntu</h2>
                <ol>
                    <li>
                        <p>Install dependencies:</p>
@@ -72,11 +72,19 @@
                </div>

                <div style="text-align: center; padding: 50px 30px 50px 30px;">
-                    <h1>Docker - the Linux container runtime</h1>
+		    <h1>Docker</h1>
+		    <h2>The Linux container runtime</h2>
                </div>

                <div style="display: block; text-align: center; padding: 10px 30px 50px 30px;">
-                    <h2 style="font-size: 16px; line-height: 1.5em;">Docker encapsulates heterogeneous payloads in Standard Containers, and runs them on any server with strong guarantees of isolation and repeatability.</h2>
+			<p>
+			Docker complements LXC with a high-level API which operates at the process level.
+			It runs unix processes with strong guarantees of isolation and repeatability across servers.
+			</p>
+
+			<p>
+			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.
+			</p>
                </div>