From 5a94d2b5b9dc0d09d8113396f26d1757142c0661 Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Thu, 8 Oct 2015 12:35:13 -0700 Subject: [PATCH] Removing the tests. We have training site now. Ugh...actually adding the files to delete Signed-off-by: Mary Anthony --- docs/userguide/dockerimages.md | 22 +++----- docs/userguide/level1.md | 76 ------------------------- docs/userguide/level2.md | 100 --------------------------------- 3 files changed, 7 insertions(+), 191 deletions(-) delete mode 100644 docs/userguide/level1.md delete mode 100644 docs/userguide/level2.md diff --git a/docs/userguide/dockerimages.md b/docs/userguide/dockerimages.md index 690f8f0c20..69dd518d22 100644 --- a/docs/userguide/dockerimages.md +++ b/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 @@ -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). - - diff --git a/docs/userguide/level1.md b/docs/userguide/level1.md deleted file mode 100644 index 74a81d790a..0000000000 --- a/docs/userguide/level1.md +++ /dev/null @@ -1,76 +0,0 @@ - - -Back - -# Dockerfile tutorial - -## Test your Dockerfile knowledge - Level 1 - -### Questions - -
- What is the Dockerfile instruction to specify the base image ?
- - -
- What is the Dockerfile instruction to execute any commands on the current image and commit the results?
- - -
- What is the Dockerfile instruction to specify the maintainer of the Dockerfile?
- - -
- What is the character used to add comment in Dockerfiles?
- - -

-

- - -

- -
- -### 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? -
-
-# This is a Dockerfile to create an image with Memcached and Emacs installed. 

-# VERSION       1.0

-# use the ubuntu base image provided by dotCloud
- ub

- E B, eric.bardin@dotcloud.com

-# make sure the package repository is up to date
- echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
- apt-get update

-# install memcached
-RUN apt-get install -y 

-# install emacs
- apt-get install -y emacs23
-
-
- - - -
-

- -## What's next? - -

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.

- -Back -Go to the next level diff --git a/docs/userguide/level2.md b/docs/userguide/level2.md deleted file mode 100644 index 5f640d4097..0000000000 --- a/docs/userguide/level2.md +++ /dev/null @@ -1,100 +0,0 @@ - - -Back - -#Dockerfile tutorial - -## Test your Dockerfile knowledge - Level 2 - -### Questions: - -
-What is the Dockerfile instruction to specify the base image?
- -
- Which Dockerfile instruction sets the default command for your image?
- -
- What is the character used to add comments in Dockerfiles?
- -
- Which Dockerfile instruction sets the username to use when running the image?
- -
- What is the Dockerfile instruction to execute any command on the current image and commit the results?
- -
- Which Dockerfile instruction sets ports to be exposed when running the image?
- -
- What is the Dockerfile instruction to specify the maintainer of the Dockerfile?
- -
- Which Dockerfile instruction lets you trigger a command as soon as the container starts?
- -
-

- -

- - -

- -
- -### Fill the Dockerfile -
-Your best friend Roberto Hashioka sent you a Dockerfile, but some parts were lost in the ocean. Can you find the missing parts? -
-
-# Redis
-#
-# VERSION       0.42
-#
-# use the ubuntu base image provided by dotCloud
-  ub

-MAINT Ro Ha roberto.hashioka@dotcloud.com

-# make sure the package repository is up to date
- echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
- apt-get update

-# install wget (required for redis installation)
- apt-get install -y wget

-# install make (required for redis installation)
- apt-get install -y make

-# install gcc (required for redis installation)
-RUN apt-get install -y 

-# install apache2
- wget http://download.redis.io/redis-stable.tar.gz
-tar xvzf redis-stable.tar.gz
-cd redis-stable && make && make install

-# launch redis when starting the image
- ["redis-server"]

-# run as user daemon
- daemon

-# expose port 6379
- 6379
-
- - -
-

-
- -## What's next? -

-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 Dockerfile best practices page. - -Back to the Docs!