updated labs

mikegcoleman · mikegcoleman · commit 1b49b2ab2f2f · 2016-06-28T10:20:56.000-07:00
diff --git a/dockercon-us/README.md b/dockercon-us/README.md
@@ -4,27 +4,29 @@
 
 This repo contains the series of hands-on labs presented at DockerCon 2016. They are designed to help you gain experience in various Docker features, products, and solutions. Depending on your experience, each lab requires between 30-45 minutes to complete. They range in difficulty from easy to advanced.
 
-In order to complete the following labs you'll need to create at least 3 Ubuntu 14.04 virtual machines and install the Docker 1.12 engine.
+Some labs will require you to setup virtual machines with Docker installed. You will find specific requirements in each individual lab guide.
 
-You can then choose one or more of the following lab tutorials to go through.
 
----
 
-## Lab 01. [Docker for Developers](https://github.com/docker/dcus-hol-2016/tree/master/docker-developer)
+## Lab 01. [Docker for Developers](./docker-developer/README.md)
 
 Docker for Mac and Docker for Windows are faster, more reliable alternatives to Docker Toolbox for running Docker locally on your Windows or Mac
 
+Infrastructure requirements: This lab requires you to install either Docker for Mac or Docker for Windows on your local machine
+
 Duration: 30 minutes
 
 In this lab you will:
 
 - Install either Docker for Mac or Docker for Windows
 - Deploy a sample Docker application
 
-## Lab 02. [Docker Datacenter](https://github.com/docker/dcus-hol-2016/tree/master/docker-datacenter)
+## Lab 02. [Docker Datacenter](./docker-datacenter/README.md)
 
 Docker Datacenter brings container management and deployment services to enterprises with a production-ready platform supported by Docker and hosted locally behind the firewall.
 
+Infrastructure requirements: This lab requires 3 virtual machines running the latest version of Docker Engine 1.11
+
 Duration: 45 minutes
 
 In this lab you will:
@@ -34,10 +36,16 @@ In this lab you will:
 - Deploy a multi-container application
 - Use users and teams to implement role-based access control
 
-## Lab 03. [Docker Cloud](https://github.com/docker/dcus-hol-2016/tree/master/docker-cloud)
+## Lab 03. [Docker Cloud](./docker-cloud/README.md)
 
 Docker Cloud is Docker's cloud platform to build, ship and run your containerized applications. Docker Cloud enables teams to come together to collaborate on their projects and to automate complex continuous delivery flows. So you can focus on working and improving your app, and leave the rest up to Docker Cloud. Docker Cloud offers a set of services that can be used individually or together for an end-to end solution.
 
+Infrastructure requirements: 
+
+- For the management host you may use your local laptop running Docker for Mac or Docker for Windows OR you may use a virtual machine running the latest version of Docker Engine 1.11
+
+- For the managed node you will need one virtual machine running one of the supported Linux distros (RHEL 
+
 Duration: 45 minutes
 
 In this lab you will:
@@ -48,25 +56,15 @@ In this lab you will:
 - Build an automated CI/CD pipeline with GitHub and Docker Cloud
 
 
-## Lab 04. [Windows Server Containers and Docker](https://github.com/docker/dcus-hol-2016/tree/master/windows-containers)
-
-Windows-based Docker containers will debut with the release of Windows Server 2016 later this year. Using the same CLI and APIs that Docker uses today on Linux, Windows users will be able to build, ship, and run software faster than ever before. This lab uses a technical preview of Windows Server 2016 to give you a core introduction to Windows Server Containers and the Docker Engine on Windows. 
-
-Duration: 15 minutes
-
-In this lab you will:
-
-- Pull Docker images for Windows
-- Build an application, 
-- Dockerize it and iterate on it.
-
-
-## Lab 05. [Docker Native Orchestration](https://github.com/docker/dcus-hol-2016/tree/master/docker-orchestration)
+## Lab 04. [Docker Native Orchestration](./docker-orchestration/README.md)
 
 In this lab you will try out the new features from Docker engine 1.12 that provide native container orchestration. You will deploy a Dockerized application to a single host and test the application. You will then configure Docker for Swarm Computing and deploy the same app across multiple hosts. You will then see how to scale the application and move the workload across different hosts easily.
 
+Infrastructure requirements: You need three virtual machines each running at least RC2 of Docker Engine 1.12. You can install the latest stable release of Docker Engine 1.12 from http://test.docker.com
+
 Duration: 45 minutes
 
+
 In this lab you will:
 
 - Deploy a single host application with a Dockerfile
@@ -75,11 +73,3 @@ In this lab you will:
 - Scale the application
 - Drain a node and reschedule the containers
 
-
-
-
----
-
-## Contribute Your Own Labs
-
-If you have an awesome tutorial/lab and would like to add it here. Please open a PR. We would love to add more exciting tutorials to the list!
diff --git a/dockercon-us/docker-cloud/README.md b/dockercon-us/docker-cloud/README.md
@@ -1,8 +1,5 @@
 # Lab 3: Docker Cloud
 
-##IMPORTANT: If you intend to do the Docker Datacenter lab today, you should do that BEFORE completing this lab.
-
-
 > **Difficulty**: Beginner
 
 > **Time**: Approximately 45 minutes
@@ -49,14 +46,15 @@ When you encounter a phrase in between `<` and `>`  you are meant to substitute
 
 For instance if you see `ssh <username>@<hostname>` you would actually type something like `ssh labuser@v111node0-adaflds023asdf-23423kjl.appnet.com`
 
-You will be asked to SSH into various nodes. These nodes are referred to as **v111node0**, **v111node1** etc. These tags correspond to the very beginning of the hostnames you will find in your welcome email. 
+You will be asked to SSH into various nodes. These nodes are referred to as **v111node0** and **v111node1** (optional) etc. 
 
 ## <a name="prerequisites"></a>Task 0: Prerequisites
 
 In order to complete this lab, you will need the following:
 
 - A Docker ID
-- A management host (you can use your laptop or one of the Azure nodes supplied in your registration email)
+- A management host (you can use your laptop or a virtual machine with Docker Engine 1.11)
+- A managed node which needs to be a virtual machine running Docker Engine 1.11
 - A GitHub account
 - Git installed locally on your machine (if you are using your machine for the *management host*)
 
@@ -92,19 +90,17 @@ You have two options with regards to choosing a *management host*:
 
 - **Option 1 (recommended)**: Use your own laptop
 
-	In order to use your own laptop, you will need to have Docker installed. 
-
-	We recommend you install either the Docker for Mac or Docker for Windows beta. If you'd like to do this please refer to the <a href="https://github.com/docker/dcus-hol-2016/tree/master/docker-developer"> Docker for developers lab</a>, and follow the installation instructions there for your operating system 
+	In order to use your own laptop, you will need to have Docker installed. You can find instructions on how to install docker on our <a href="https://www.docker.com/products/docker">products page</a>.
 
-	> **Note**: You only need to do the installation portion of the Docker for Developers lab, you don't need to complete the whole lab unless you'd like to).
+	We recommend you install either the Docker for Mac or Docker for Windows beta. 
 
 	If you choose this option, you will install the Docker Cloud CLI and execute commands in a terminal or command window on your laptop.
 
-- **Option 2**: Use an Azure-based virtual machine
+- **Option 2**: Use a virtual machine
 	
-	If you do not wish to install any software locally you can use one of the Azure VMs as your *management host*
+	If you do not wish to install any software locally you can use one a VM as your *management host*
 
-	If you choose this option, you will install the Docker Cloud CLI an execute all commands on the **v111node1** virtual machine. 
+	If you choose this option, you will install the Docker Cloud CLI an execute all commands on the virtual machine which we'll refer to as **v111node1**. The VM will need to have Docker 1.11 installed. 
 		
   
 ### GitHub account
@@ -114,7 +110,6 @@ In order to complete the CI/CD portions of this lab, you will need an account on
 Continue with the lab as soon as you have completed the prerequisites.
 
 ### Git installed 
-If you are using your own laptop for you *management host*, you'll need to make sure you have `git` installed (it's already installed if you are using `Second v.1.11 node`). 
 
 Visit <a href="https://git-scm.com/book/en/v2/Getting-Started-Installing-Git">the git website</a> for information how how to install `git`
 
@@ -126,7 +121,7 @@ The Docker Cloud CLI allows you to interact directly with Docker Cloud, and you
 
 Installing the Docker Cloud CLI differs based on the operating system of your *management host*.
 
-1. Make sure you are logged on to your *management host*: Either a local terminal/command window if using Docker for Mac or Docker for Windows, or an SSH session to **v111node1** if you are using the Azure VM.
+1. Make sure you are logged on to your *management host*: Either a local terminal/command window if using Docker for Mac or Docker for Windows, or an SSH session to **v111node1** if you are using a VM.
 
 2. Install the `docker-cloud` CLI.
 
@@ -162,7 +157,7 @@ In this step you'll deploy the Docker Cloud agent to an existing Docker host (**
 
 > **Note** that this is **v111node0** which is different than **v111node1** that you *may* have used for your *management host* in the previous step.
 
-1. Open a terminal window and SSH into **v111node0** (you can find the hostname and password in your welcome email)
+1. Open a terminal window and SSH into **v111node0** 
 
 		ssh <username>@<v111node0 hostname>
 
@@ -188,7 +183,7 @@ In this step you'll deploy the Docker Cloud agent to an existing Docker host (**
 
 		$ curl -Ls https://get.cloud.docker.com/ | sudo -H sh -s c7a941OHAIac9419e837f940fab9aa4f1
 
- If prompted ender the password from your email for **v111node0**
+ If prompted ender the password for **v111node0**
 	
  > **Note**: Remember to cut and paste the command and token from the Docker Cloud UI and not the one form the example above.
 
diff --git a/dockercon-us/docker-datacenter/README.md b/dockercon-us/docker-datacenter/README.md
@@ -20,7 +20,9 @@ you will be able to quickly familiarize yourself with the features of Docker Uni
 ## <a name="prerequisites"></a>Prerequisites
 
 - Three VMs with Docker Engine 1.11 Installed
-- Each VM will be referred to as v111node0, v111node1, and v111node2
+- Each VM will be referred to as v111node0, v111node1, and v111node2
+	- v111node0 will be the UCP controller
+	- v111node1 and v111node2 will be worker nodes in your UCP cluster	
 
 ## <a name="install-ucp-controller"></a>Install UCP
 
@@ -38,7 +40,7 @@ available, check the [reference documentation](../reference/install.md).
 
 To install UCP:
 
-1. Log in to your first VM (v111node0) where you will install UCP.  v111node0 will act as your controller node. You will find the hostname, username, and password in your email
+1. Log in to your first VM (v111node0) where you will install UCP.  v111node0 will act as your controller node. 
 
 		$ ssh <username>@<v111node0 hostname>
 
@@ -61,11 +63,11 @@ To install UCP:
 
 	- **Password**: enter a password of your choosing
 
-	- **Additional Aliases**: enter your the hostname for **v111node0** which can be found in your email (for example: v111node0-0e23927a6fc9472089bf4c7aeca47ca2-3.cloudapp.net)
+	- **Additional Aliases**: enter your the hostname for **v111node0** 
 
 	> **Note**: The install with finish with a message to log into your UCP controller at an IP address similar to 10.0.0.2. Ignore this, the address supplied is a private IP, and cannot be used to access UCP.
 
-1. Log into your UCP cluster by pointing your browser to `https://<v111node0 hostname>` (you can find your hostname in the email you received)
+1. Log into your UCP cluster by pointing your browser to `https://<v111node0 hostname>` 
 
 	> **Note**: use `https://` not `http://`
 
@@ -107,7 +109,7 @@ To install UCP:
 
 Now that we have our controller-node installed with UCP.  We have to join other nodes to our controller node:
 
-1. Log into your second VM (**v111node1**) (You can find your username, password, and hostname in the email you received)
+1. Log into your second VM (**v111node1**) 
 
 		$ ssh <username>@<v111node1 hostname>
 
@@ -184,7 +186,7 @@ In order to access the NGINX container from your web browser you will need the D
 
 In this particular example, the **nginx_server** container is running on the **v111node1** node with an IP of 10.0.0.55 - However, this is the private IP address of the node and you will not be able to use this address to connect to the web server. Locate the hostname of the node from the lab details you received.
 
-- Go to your web browser and enter the hostname (found in your registration email) of the node that the **nginx_server** container is running on.
+- Go to your web browser and enter the hostname of the node that the **nginx_server** container is running on.
 
 You will see the NGINX welcome page.
 
@@ -263,7 +265,7 @@ web:
 
 5. Point your browser to the application.
 
-  To do this, combine the node's hostname (from your registration email) with port 5000 as follows:
+  To do this, combine the node's hostname with port 5000 as follows:
 
   - `<hostname>:5000`
 
diff --git a/dockercon-us/docker-orchestration/README.md b/dockercon-us/docker-orchestration/README.md
@@ -17,7 +17,10 @@ You will complete the following steps in this lab:
 ## Pre-requisites
 
 You will need all of the following in order to complete this lab:
+
 - Three nodes running Docker v1.12.x. Each VM will be referenced as **v112node0**, **v112node1**, and **v112node2**.
+	-  You can install the latest stable version of Docker 1.12 from <a href="http://test.docker.com">http://test.docker.com</a>
+	 
 - A Docker ID. Creating a Docker ID is free, and allows you to push and pull images from Docker Hub. [This link](https://docs.docker.com/mac/step_five/) describes how to create a Docker ID (you only need to complete the procedure up to step 2.3).
 
 
@@ -37,25 +40,11 @@ The application you will deploy is the `cats` application. It is a simple 1-cont
 
 ### Step 1.1 - Log into VMs and verify that Docker is running
 
-1. SSH to your __v112node0__ with the username of `labuser`. You should have the hostnames in an email titled "Docker Labs VMs Ready"
-
-   The command to SSH into **v112node0** will look something like the following:
+1. SSH to __v112node0__ 
 
    ```bash
    ssh labuser@<public-dns-of-v112node0>
    ```
-You will be asked for a password. The password is in the email with the DNS names of the lab VMs.
-
-An example of the sign in ...
-```bash
-ssh labuser@v112node0-9128f1906df54acda5044f56a1a86b07-2.cloudapp.net
-The authenticity of host 'v112node0-9128f1906df54acda5044f56a1a86b07-2.cloudapp.net (40.112.136.129)' can't be established.
-ECDSA key fingerprint is SHA256:3L9UZQTSCOUkzVuyO5z3H7jLedSp8/5AquUtSZ8ydEE.
-Are you sure you want to continue connecting (yes/no)? yes
-Warning: Permanently added 'v112node0-9128f1906df54acda5044f56a1a86b07-2.cloudapp.net,40.112.136.129' (ECDSA) to the list of known hosts.
-labuser@v112node0-9128f1906df54acda5044f56a1a86b07-2.cloudapp.net's password:
-Welcome to Ubuntu 14.04.4 LTS (GNU/Linux 4.2.0-23-generic x86_64)
-```
 
 2. Verify that Docker is running. This lab is based on a pre-release version of Docker Engine 1.12 so that we can show you the latest Swarm features. We are running version `1.12.0-rc1` on these VMs.
 
@@ -275,7 +264,7 @@ Now that we have verified that our application works we will push the newly crea
 
 Perform the following steps from **v112node0**.
 
-1. Login with your Docker ID.
+1. Login to Docker Hub with your Docker ID.
 
    ```bash
    labuser@v112node0:~/cats$ docker login
@@ -353,7 +342,6 @@ In this part of the demo you will use all three of the nodes in your lab. __v112
 
 1. If you haven't already done so, SSH in to **v112node0**.
 
-   For example (remember to substitute your SSH key and **v112node0** for your lab):
 
    ```
    $ ssh labuser@v112node0-9a7b5b024cf247fb8d851bf173c72619-4.cloudapp.net
