Skip to content

Commit a1d53ea

Browse files
committed
cleaning up some HoL references to DockerCon setup
1 parent bf2a6c3 commit a1d53ea

File tree

9 files changed

+15
-25
lines changed

9 files changed

+15
-25
lines changed

dockercon-us-2016/README.md

-3
This file was deleted.

dockercon-us-2017/README.md

-7
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,3 @@ This lab is aimed at ops and system admins. It steps through packaging an ASP.NE
135135
> - Package an existing ASP.NET MSI so the app runs in Docker, without any application changes.
136136
> - Create an upgraded package with application updates and Windows patches.
137137
> - Update and rollback the running application in a production environment with zero downtime.
138-
139-
140-
---
141-
142-
## Contribute Your Own Labs
143-
144-
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!

dockercon-us-2017/docker-cloud/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
In this lab, you will learn how to configure a continuous integration (CI) pipeline for a web application using Docker Cloud's automated build features. You will complete the following tasks as part of the lab:
99

10-
> - [Task 0: Configure the prerequisites](#prerequisits)
10+
> - [Task 0: Configure the prerequisites](#prerequisites)
1111
> - [Task 1: Configure Docker Cloud to Automatically Build Docker Images](#deploy_app)
1212
> - [Task 1.1: Configure Docker Cloud Autobuilds](#autobuild)
1313
> - [Task 1.2: Trigger an Autobuild](#test_autobuild)
@@ -30,9 +30,9 @@ You may be asked to SSH into various nodes. These nodes are referred to as **nod
3030
In order to complete this lab, you will need the following:
3131

3232
- A Docker ID
33-
- A management host (for this lab you'll use Linux **node0**)
33+
- A management host (for this lab you'll need a Linux named **node0**)
3434
- A GitHub account
35-
- Git installed (It hould already be installed in your Azure VM)
35+
- Git installed
3636

3737
### Obtain a Docker ID
3838

@@ -88,7 +88,7 @@ Now that you've got Docker Cloud linked to your GitHub account, we'll start by f
8888

8989
Next, we'll clone the repository into our local Docker environment. The following commands will be executed in the terminal or command window from Linux **node0**
9090

91-
1. If you have not already log into your Azure VM. For example (be sure to use the actual node name supplied in your email):
91+
1. If you have not already, log into your Azure VM. For example:
9292

9393
```ssh ubuntu@node0-gvs0mgc0216.southcentralus.cloudapp.azure.com```
9494

dockercon-us-2017/docker-enterprise/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following task will guide you through how to create a UCP cluster on your ho
5757

5858
### <a name="task1.1"></a>Task 1.1: Installing the UCP Manager
5959

60-
1. Log in to `node0` of the three nodes you have been given for this lab. The username for all of the Linux nodes is `ubuntu` and the node will have a unique password that should be in your email. You may be prompted whether you want to continue. Answer `yes` and then enter the password.
60+
1. Log in to `node0` of the three nodes you have been given for this lab. You may be prompted whether you want to continue. Answer `yes` and then enter the password.
6161

6262
```
6363
$ ssh ubuntu@node0-smwqii1akqh.southcentralus.cloudapp.azure.com

dockercon-us-2017/docker-networking/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ When you encounter a phrase in between `<` and `>` you are meant to substitute
2222

2323
For instance if you see `ssh <username>@<hostname>` you would actually type something like `ssh ubuntu@node0-a.ivaf2i2atqouppoxund0tvddsa.jx.internal.cloudapp.net`
2424

25-
You will be asked to SSH into various nodes. These nodes are referred to as **node0-a**, **node1-b**, **node2-c**, etc. These tags correspond to the very beginning of the hostnames found on the hands on labs welcome card you were given.
25+
You will be asked to SSH into various nodes. These nodes are referred to as **node0-a**, **node1-b**, **node2-c**, etc.
2626

2727
## <a name="prerequisites"></a>Prerequisites
2828

@@ -830,4 +830,4 @@ Lets also run `docker swarm leave --force` on **node1-b**.
830830
$ docker swarm leave --force
831831
```
832832

833-
Congratulations! You've completed this lab. Feel free to try any of the other labs.
833+
Congratulations! You've completed this lab!

dockercon-us-2017/docker-orchestration/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ When you encounter a phrase in between `<` and `>` you are meant to substitute
2323

2424
For instance if you see `ssh <username>@<hostname>` you would actually type something like `ssh ubuntu@node0-a.ivaf2i2atqouppoxund0tvddsa.jx.internal.cloudapp.net`
2525

26-
You will be asked to SSH into various nodes. These nodes are referred to as **node0-a**, **node1-b**, **node2-c**, etc. These tags correspond to the very beginning of the hostnames found on the hands on labs welcome card you were given.
26+
You will be asked to SSH into various nodes. These nodes are referred to as **node0-a**, **node1-b**, **node2-c**, etc.
2727

2828
## <a name="prerequisites"></a>Prerequisites
2929

@@ -230,7 +230,7 @@ You will perform the following procedure from **node0-a**.
230230

231231
Our `sleep` application is becoming very popular on the internet (due to hitting Reddit and HN). People just love it. So, you are going to have to scale your application to meet peak demand. You will have to do this across multiple hosts for high availability too. We will use the concept of *Services* to scale our application easily and manage many containers as a single entity.
232232

233-
> *Services* are a new concept in Docker 1.12. They work with swarms and are intended for long-running containers.
233+
> *Services* were a new concept in Docker 1.12. They work with swarms and are intended for long-running containers.
234234
235235
You will perform this procedure from **node0-a**.
236236

@@ -430,4 +430,4 @@ Finally, run `docker swarm leave --force` on **node2-c**.
430430
$ docker swarm leave --force
431431
```
432432

433-
Congratulations! You've completed this lab. You now know how to build a swarm, deploy applications as collections of services, and scale individual services up and down. Feel free to try any of the other labs.
433+
Congratulations! You've completed this lab. You now know how to build a swarm, deploy applications as collections of services, and scale individual services up and down.

dockercon-us-2017/windows-101/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ When you encounter a phrase in between `<` and `>` you are meant to substitute
2828

2929
For instance if you see `$ip = <ip-address>` you would actually type something like `$ip = '10.0.0.4'`
3030

31-
You will be asked to RDP into various servers. You will find the actual server names to use in your welcome email.
31+
You will be asked to RDP into various servers.
3232

3333
## <a name="prerequisites"></a>Prerequisites
3434

35-
You will be provided a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
35+
You will need a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
3636

3737
- Windows - use the built-in Remote Desktop Connection app.
3838
- Mac - install [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12) from the app store.

dockercon-us-2017/windows-modernize-aspnet-dev/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ When you encounter a phrase in between `<` and `>` you are meant to substitute
4343

4444
For instance if you see `$ip = <ip-address>` you would actually type something like `$ip = '10.0.0.4'`
4545

46-
You will be asked to RDP into various servers. You will find the actual server names to use in your welcome email.
46+
You will be asked to RDP into various servers.
4747

4848
## <a name="prerequisites"></a>Prerequisites
4949

50-
You will be provided a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
50+
You need a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
5151

5252
- Windows - use the built-in Remote Desktop Connection app.
5353
- Mac - install [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12) from the app store.

dockercon-us-2017/windows-modernize-aspnet-ops/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You will be asked to RDP into various servers. You will find the actual server n
4646

4747
## <a name="prerequisites"></a>Prerequisites
4848

49-
You will be provided a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
49+
You will need a set of Windows Server 2016 virtual machines running in Azure, which are already configured with Docker and the Windows base images. You do not need Docker running on your laptop, but you will need a Remote Desktop client to connect to the VMs.
5050

5151
- Windows - use the built-in Remote Desktop Connection app.
5252
- Mac - install [Microsoft Remote Desktop](https://itunes.apple.com/us/app/microsoft-remote-desktop/id715768417?mt=12) from the app store.

0 commit comments

Comments
 (0)