Merge pull request #16861 from moxiegirl/fix-testing-stuff

Removing the tests.

docs/userguide/dockerimages.md

@@ -86,7 +86,7 @@ If instead we wanted to run an Ubuntu 12.04 image we'd use:
 If you don't specify a variant, for example you just use `ubuntu`, then Docker
 will default to using the `ubuntu:latest` image.
 
-> **Tip:** 
+> **Tip:**
 > We recommend you always use a specific tagged image, for example
 > `ubuntu:12.04`. That way you always know exactly what variant of an image is
 > being used.
@@ -191,7 +191,7 @@ we'd like to update.
     $ docker run -t -i training/sinatra /bin/bash
     root@0b2616b0e5a8:/#
 
-> **Note:** 
+> **Note:**
 > Take note of the container ID that has been created, `0b2616b0e5a8`, as we'll
 > need it in a moment.
 
@@ -285,14 +285,14 @@ a command inside the image, for example installing a package. Here we're
 updating our APT cache, installing Ruby and RubyGems and then installing the
 Sinatra gem.
 
-> **Note:** 
+> **Note:**
 > There are [a lot more instructions available to us in a Dockerfile](/reference/builder).
 
 Now let's take our `Dockerfile` and use the `docker build` command to build an image.
 
     $ docker build -t ouruser/sinatra:v2 .
     Sending build context to Docker daemon 2.048 kB
-    Sending build context to Docker daemon 
+    Sending build context to Docker daemon
     Step 1 : FROM ubuntu:14.04
      ---> e54ca5efa2e9
     Step 2 : MAINTAINER Kate Smith <ksmith@example.com>
@@ -477,9 +477,9 @@ instructions have executed we're left with the `97feabe5d2ed` image
 (also helpfully tagged as `ouruser/sinatra:v2`) and all intermediate
 containers will get removed to clean things up.
 
-> **Note:** 
+> **Note:**
 > An image can't have more than 127 layers regardless of the storage driver.
-> This limitation is set globally to encourage optimization of the overall 
+> This limitation is set globally to encourage optimization of the overall
 > size of images.
 
 We can then create a container from our new image.
@@ -487,7 +487,7 @@ We can then create a container from our new image.
     $ docker run -t -i ouruser/sinatra:v2 /bin/bash
     root@8196968dac35:/#
 
-> **Note:** 
+> **Note:**
 > This is just a brief introduction to creating images. We've
 > skipped a whole bunch of other instructions that you can use. We'll see more of
 > those instructions in later sections of the Guide or you can refer to the
@@ -496,9 +496,6 @@ We can then create a container from our new image.
 > To help you write a clear, readable, maintainable `Dockerfile`, we've also
 > written a [`Dockerfile` Best Practices guide](/articles/dockerfile_best-practices).
 
-### More
-
-To learn more, check out the [Dockerfile tutorial](/userguide/level1).
 
 ## Setting tags on an image
 
@@ -574,9 +571,4 @@ Until now we've seen how to build individual applications inside Docker
 containers. Now learn how to build whole application stacks with Docker
 by linking together multiple Docker containers.
 
-Test your Dockerfile knowledge with the
-[Dockerfile tutorial](/userguide/level1).
-
 Go to [Linking Containers Together](/userguide/dockerlinks).
-
-

docs/userguide/level1.md

@@ -1,76 +0,0 @@
-<!--[metadata]>
-+++
-title = "Docker images test"
-description = "How to work with Docker images."
-keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub,  collaboration"]
-+++
-<![end-metadata]-->
-
-<a title="back" class="dockerfile back" href="/userguide/dockerimages/#creating-our-own-images">Back</a>
-
-# Dockerfile tutorial
-
-## Test your Dockerfile knowledge - Level 1
-
-### Questions
-
-<div name="level1_questions">
-	What is the Dockerfile instruction to specify the base image ?<br />
-	<input type="text" class="level" id="level1_q0"/>
-	<div class="alert alert-error level_error" id="level1_error0" style="display:none;">The right answer was <code>FROM</code></div>
-	<br>
-	What is the Dockerfile instruction to execute any commands on the current image and commit the results?<br />
-	<input type="text" class="level" id="level1_q1"/>
-	<div class="alert alert-error level_error" id="level1_error1" style="display:none;">The right answer was <code>RUN</code></div>
-	<br>
-	What is the Dockerfile instruction to specify the maintainer of the Dockerfile?<br />
-	<input type="text" class="level" id="level1_q2"/>
-	<div class="alert alert-error level_error" id="level1_error2" style="display:none;">The right answer was <code>MAINTAINER</code></div>
-	<br>
-	What is the character used to add comment in Dockerfiles?<br />
-	<input type="text" class="level" id="level1_q3"/>
-	<div class="alert alert-error level_error" id="level1_error3" style="display:none;">The right answer was <code>#</code></div>
-	<p>
-	<div class="alert alert-success" id="all_good" style="display:none;">Congratulations, you made no mistake!<br />
-	Tell the world <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.docker.io/learn/dockerfile/level1/" data-text="I just successfully answered questions of the #Dockerfile tutorial Level 1. What's your score?" data-via="docker" >Tweet</a><br />
-	And try the next challenge: <a href="#fill-the-dockerfile">Fill the Dockerfile</a>
-	</div>
-	<div class="alert alert-error" id="no_good" style="display:none;">Your Dockerfile skills are not yet perfect, try to take the time to read this tutorial again.</div>
-	<div class="alert alert-block" id="some_good" style="display:none;">You're almost there! Read carefully the sections corresponding to your errors, and take the test again!</div>
-	</p>
-	<button class="btn btn-primary" id="check_level1_questions">Check your answers</button>
-</div>
-
-### Fill the Dockerfile
-Your best friend Eric Bardin sent you a Dockerfile, but some parts were lost in the ocean. Can you find the missing parts?
-<div class="form-inline">
-<pre>
-&#35; This is a Dockerfile to create an image with Memcached and Emacs installed. <br>
-&#35; VERSION       1.0<br>
-&#35; use the ubuntu base image provided by dotCloud
-<input type="text" class="l_fill" id="from" /> ub<input type="text" class="l_fill" id="ubuntu" /><br>
-<input type="text" class="l_fill" id="maintainer" /> E<input type="text" class="l_fill" id="eric" /> B<input type="text" class="l_fill" id="bardin" />, eric.bardin@dotcloud.com<br>
-&#35; make sure the package repository is up to date
-<input type="text" class="l_fill" id="run0"/> echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-<input type="text" class="l_fill" id="run1" /> apt-get update<br>
-&#35; install memcached
-RUN apt-get install -y <input type="text" class="l_fill" id="memcached" /><br>
-&#35; install emacs
-<input type="text" class="l_fill" id="run2"/> apt-get install -y emacs23
-</pre>
-</div>
-
-<div class="alert alert-success" id="dockerfile_ok" style="display:none;">Congratulations, you successfully restored Eric's Dockerfile! You are ready to containerize the world!.<br />
-Tell the world! <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://www.docker.io/learn/dockerfile/level1/" data-text="I just successfully completed the 'Fill the Dockerfile' challenge of the #Dockerfile tutorial Level 1" data-via="docker" >Tweet</a>
-</div>
-<div class="alert alert-error" id="dockerfile_ko" style="display:none;">Wooops, there are one or more errors in the Dockerfile. Try again.</div>
-<br>
-<button class="btn btn-primary" id="check_level1_fill">Check the Dockerfile</button></p>
-
-## What's next?
-
-<p>In the next level, we will go into more detail about how to specify which command should be executed when the container starts,
-which user to use, and how expose a particular port.</p>
-
-<a title="back" class="btn btn-primary back" href="/userguide/dockerimages/#creating-our-own-images">Back</a>
-<a title="next level" class="btn btn-primary" href="/userguide/level2">Go to the next level</a>

docs/userguide/level2.md

@@ -1,100 +0,0 @@
-<!--[metadata]>
-+++
-title = "Docker images test"
-description = "How to work with Docker images."
-keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub,  collaboration"]
-+++
-<![end-metadata]-->
-
-<a title="back" class="dockerfile back" href="/userguide/dockerimages/#creating-our-own-images">Back</a>
-
-#Dockerfile tutorial
-
-## Test your Dockerfile knowledge - Level 2
-
-### Questions:
-
-<div class="level_questions">
-What is the Dockerfile instruction to specify the base image?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error0" class="alert alert-error level_error">The right answer was <code>FROM</code></div><br>
-	Which Dockerfile instruction sets the default command for your image?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error4" class="alert alert-error level_error">The right answer was <code>ENTRYPOINT</code> or <code>CMD</code></div><br>
-	What is the character used to add comments in Dockerfiles?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error3" class="alert alert-error level_error">The right answer was <code>#</code></div><br>
-    Which Dockerfile instruction sets the username to use when running the image?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error5" class="alert alert-error level_error">The right answer was <code>USER</code></div><br>
-	What is the Dockerfile instruction to execute any command on the current image and commit the results?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error1" class="alert alert-error level_error">The right answer was <code>RUN</code></div><br>
-	Which Dockerfile instruction sets ports to be exposed when running the image?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error6" class="alert alert-error level_error">The right answer was <code>EXPOSE</code></div><br>
-	What is the Dockerfile instruction to specify the maintainer of the Dockerfile?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error2" class="alert alert-error level_error">The right answer was <code>MAINTAINER</code></div><br>
-	Which Dockerfile instruction lets you trigger a command as soon as the container starts?<br>
-	<input type="text" class="level">
-	<div style="display:none;" id="level2_error7" class="alert alert-error level_error">The right answer was <code>ENTRYPOINT</code> or <code>CMD</code></div><br>
-	<p>
-	
-	<div class="alert alert-success" id="all_good" style="display:none;">Congratulations, you made no mistake!<br />
-	Tell the world <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.docker.io/learn/dockerfile/level1/" data-text="I just successfully answered questions of the #Dockerfile tutorial Level 1. What's your score?" data-via="docker" >Tweet</a><br />
-	And try the next challenge: <a href="#fill-the-dockerfile">Fill the Dockerfile</a>
-	</div>
-	<div class="alert alert-error" id="no_good" style="display:none;">Your Dockerfile skills are not yet perfect, try to take the time to read this tutorial again.</div>
-	<div class="alert alert-block" id="some_good" style="display:none;">You're almost there! Read carefully the sections corresponding to your errors, and take the test again!</div>
-	</p>
-	<button class="btn btn-primary" id="check_level2_questions">Check your answers</button>
-</div>
-
-### Fill the Dockerfile
-<br>
-Your best friend Roberto Hashioka sent you a Dockerfile, but some parts were lost in the ocean. Can you find the missing parts?
-<div class="form-inline">
-<pre>
-&#35; Redis
-&#35;
-&#35; VERSION       0.42
-&#35;
-&#35; use the ubuntu base image provided by dotCloud
-<input id="from" class="l_fill" type="text">  ub<input id="ubuntu" class="l_fill" type="text"><br>
-MAINT<input id="maintainer" class="l_fill" type="text"> Ro<input id="roberto" class="l_fill" type="text"> Ha<input id="hashioka" class="l_fill" type="text"> roberto.hashioka@dotcloud.com<br>
-&#35; make sure the package repository is up to date
-<input id="run0" class="l_fill" type="text"> echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-<input id="run1" class="l_fill" type="text"> apt-get update<br>
-&#35; install wget (required for redis installation)
-<input id="run2" class="l_fill" type="text"> apt-get install -y wget<br>
-&#35; install make (required for redis installation)
-<input id="run3" class="l_fill" type="text"> apt-get install -y make<br>
-&#35; install gcc (required for redis installation)
-RUN apt-get install -y <input id="gcc" class="l_fill" type="text"><br>
-&#35; install apache2
-<input id="run4" class="l_fill" type="text"> wget http://download.redis.io/redis-stable.tar.gz
-<input id="run5" class="l_fill" type="text">tar xvzf redis-stable.tar.gz
-<input id="run6" class="l_fill" type="text">cd redis-stable && make && make install<br>
-&#35; launch redis when starting the image
-<input id="entrypoint" class="l_fill" type="text"> ["redis-server"]<br>
-&#35; run as user daemon
-<input id="user" class="l_fill" type="text"> daemon<br>
-&#35; expose port 6379
-<input id="expose" class="l_fill" type="text"> 6379
-</pre>
-<div class="alert alert-success" id="dockerfile_ok" style="display:none;">Congratulations, you successfully restored Roberto's Dockerfile! You are ready to containerize the world!.<br />
-    Tell the world! <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.docker.io/learn/dockerfile/level2/" data-text="I just successfully completed the 'Dockerfill' challenge of the #Dockerfile tutorial Level 2" data-via="docker" >Tweet</a>
-</div>
-<div class="alert alert-error" id="dockerfile_ko" style="display:none;">Wooops, there are one or more errors in the Dockerfile. Try again.</div>
-<br>
-<button class="btn btn-primary" id="check_level2_fill">Check the Dockerfile</button></p>
-</div>
-    
-## What's next?
-<p>
-Thanks for going through our tutorial! We will be posting Level 3 in the future. 
-
-To improve your Dockerfile writing skills even further, visit the <a href="https://docs.docker.com/articles/dockerfile_best-practices/">Dockerfile best practices page</a>.
-
-<a title="creating our own images" class="btn btn-primary" href="/userguide/dockerimages/#creating-our-own-images">Back to the Docs!</a>