Merge pull request #365 from arun-gupta/dockercon1

#DockerCon sprint

Author: Mano Marks

developer-tools/java/chapters/ch01-setup.adoc

@@ -16,61 +16,26 @@ NOTE: An older version of the operating system may be used. The installation ins
 
 == Install Docker
 
-Docker runs natively on Mac, Windows and Linux. This lab will use https://www.docker.com/community-edition[Docker Community Edition]. Follow the https://www.docker.com/community-edition[instructions] to install Docker.
+Docker runs natively on Mac, Windows and Linux. This lab will use https://www.docker.com/community-edition[Docker Community Edition (CE)]. Download the Docker CE edition for your machine from the https://store.docker.com/search?type=edition&offering=community[Docker Store]. 
 
-This workshop is tested with Docker Community Edition `17.09.0-ce-rc2, build 363a3e7` on Mac OS X `10.12.5`.
-
-NOTE: Docker Community Edition have requirements for a fairly recent operating system version. If your machine does not meet these requirements, then you need to install https://www.docker.com/products/docker-toolbox[Docker Toolbox]. However, the workshop instructions are all explained using Docker CE.
-
-=== Additional components
-
-If Docker is installed using Docker CE or Docker Toolbox, then this section is not required.
-
-Install the following additional components:
+NOTE: Docker CE requires a fairly recent operating system version. If your machine does not meet the requirements, then you need to install https://www.docker.com/products/docker-toolbox[Docker Toolbox]. 
 
-. https://docs.docker.com/compose/install/[Docker Compose]
-
-=== Docker Toolbox Notes
-
-Skip this section if you are using Docker CE.
-
-. *Default Docker Machine*: Docker Toolbox creates a Docker Machine named `default`. To make it easier to start/stop the containers, an entry is added into the host mapping table of your operating system. 
-+
-Find out the IP address of your Docker Machine:
-+
-```
-docker-machine ip default
-```
-+
-This will provide the IP address associated with the Docker Machine created by Toolbox.
-+
-Edit `/etc/hosts` (Mac OS) or `C:\Windows\System32\drivers\etc\hosts` (Windows) and add:
-+
-[source, text]
-----
-<IP ADDRESS>  dockerhost
-----
-+
-This allows to access Docker containers using `dockerhost`.
-+
-. *Docker CLI Shell*: Any Docker CLI command needs to be issued from the Terminal or Command Prompt where `eval $(docker-machine env default)` command was issued. This will make sure Docker CLI is configured to talk to the VM created by Docker Toolbox.
+This workshop is tested with Docker Community Edition `17.09.0-ce-rc2, build 363a3e7` on Mac OS X `10.12.5`.
 
 == Download Images
 
 This tutorial uses a few Docker images and software. Let's download them before we start the tutorial.
 
-Download the file from https://raw.githubusercontent.com/docker/labs/master/developer-tools/java/scripts/docker-compose-pull-images.yml and give the command to pull all the images:
+Download the file from https://raw.githubusercontent.com/docker/labs/master/developer-tools/java/scripts/docker-compose-pull-images.yml and use the following command to pull the required images:
 
-```
-docker-compose -f docker-compose-pull-images.yml pull --parallel
-```
-
-NOTE: `--parallel` switch will not work for Docker Compose version prior to 1.12. If you are using an older version then remove the `--parallel` switch.
+    docker-compose -f docker-compose-pull-images.yml pull --parallel
 
 NOTE: For Linux, `docker-compose` and `docker` commands need `sudo` access. So prefix all commands with `sudo`.
 
 == Other Software
 
+The software in this section is specific to certain parts of the workshop. Install them only if you plan to attempt them.
+
 . Install https://git-scm.com//[git].
 . Install Docker Cloud CLI following the https://docs.docker.com/docker-cloud/installing-cli/[instructions].
 . Download Java IDE based upon your choice and install.

developer-tools/java/chapters/ch02-basic-concepts.adoc

@@ -8,13 +8,13 @@
 *PURPOSE*: This chapter introduces the basic terminology of Docker.
 
 [quote, docs.docker.com/]
-Docker is a platform for developers and sysadmins to build, ship, and run applications. Docker lets you quickly assemble applications from components and eliminates the friction that can come when shipping code. Docker lets you get your code tested and deployed into production as fast as possible.
+Docker is a platform for developers and sysadmins to build, ship, and run applications. Docker lets you quickly assemble applications from components and eliminates the friction that can come when shipping code. Docker lets you test and deploy your code into production as fast as possible.
 
 Docker simplifies software delivery by making it easy to build and share images that contain your application’s entire environment, or _application operating system_.
 
 **What does it mean by an application operating system ?**
 
-Your application typically require a specific version of operating system, application server, JDK, database server, may require to tune the configuration files, and similarly multiple other dependencies. The application may need binding to specific ports and certain amount of memory. The components and configuration together required to run your application is what is referred to as application operating system.
+Your application typically requires specific versions for your operating system, application server, JDK, and database server, may require to tune the configuration files, and similarly multiple other dependencies. The application may need binding to specific ports and certain amount of memory. The components and configuration together required to run your application is what is referred to as application operating system.
 
 You can certainly provide an installation script that will download and install these components. Docker simplifies this process by allowing to create an image that contains your application and infrastructure together, managed as one component. These images are then used to create Docker containers which run on the container virtualization platform, provided by Docker.
 

developer-tools/java/chapters/ch03-build-image-java-9.adoc

@@ -44,7 +44,7 @@ constraints are honored.
 
 Build the image using the command:
 
-  docker build -t jdk-9-debian-slim -f jdk-9-debian-slim.Dockerfile .
+  docker image build -t jdk-9-debian-slim -f jdk-9-debian-slim.Dockerfile .
 
 List the images available using `docker image ls`:
 
@@ -89,15 +89,15 @@ $1 ==> 100
 ----
 
 Notice that the Java process is honoring memory constraints (see the `--memory`
-of `docker run`) and will not allocate memory beyond that specified for the
+of `docker container run`) and will not allocate memory beyond that specified for the
 container.
 
 In a future release of the JDK it will no longer be necessary to specify an
 experimental flag (`-XX:+UnlockExperimentalVMOptions`) once the mechanism by
 which memory constraints are efficiently detected is stable.
 
 JDK 9 supports the set CPUs constraint (see the `--cpuset-cpus` of
-`docker run`) but does not currently support other CPU constraints such as
+`docker container run`) but does not currently support other CPU constraints such as
 CPU shares.  This is ongoing work http://openjdk.java.net/jeps/8182070[tracked]
 in the OpenJDK project.
 
@@ -234,7 +234,7 @@ The image is configured in the same manner as for the `debian`-based image.
 
 Build the image using the command:
 
-  docker build -t jdk-9-alpine -f jdk-9-alpine.Dockerfile .
+  docker image build -t jdk-9-alpine -f jdk-9-alpine.Dockerfile .
 
 List the images available using `docker image ls`:
 
@@ -268,7 +268,7 @@ so you can make modifications.)
 Enter the directory `helloworld-java-9` and build the project from within a
 running Docker container with JDK 9 installed:
 
-  docker run --volume $PWD:/helloworld-java-9 --workdir /helloworld-java-9 \
+  docker container run --volume $PWD:/helloworld-java-9 --workdir /helloworld-java-9 \
       -it --rm openjdk:9-jdk-slim \
       ./mvnw package
 
@@ -298,7 +298,7 @@ CMD java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
 Build a Docker image containing the simple Java application based of the Docker
 image `jdk-9-debian-slim`:
 
-    docker build -t helloworld-jdk-9 -f helloworld-jdk-9.Dockerfile .
+    docker image build -t helloworld-jdk-9 -f helloworld-jdk-9.Dockerfile .
 
 List the images available using `docker image ls`:
 
@@ -317,7 +317,7 @@ Notice how large the application image `helloworld-jdk-9`.
 
 Run the `jdeps` tool to see what modules the application depends on:
 
-  docker run -it --rm helloworld-jdk-9 jdeps --list-deps /opt/helloworld/helloworld-1.0-SNAPSHOT.jar
+  docker container run -it --rm helloworld-jdk-9 jdeps --list-deps /opt/helloworld/helloworld-1.0-SNAPSHOT.jar
 
 and observe that the application only depends on the `java.base` module.
 
@@ -332,7 +332,7 @@ that in application Docker image.
 Create a custom Java runtime that is small and only contains the `java.base`
 module:
 
-    docker run --rm \
+    docker container run --rm \
       --volume $PWD:/out \
       jdk-9-debian-slim \
       jlink --module-path /opt/jdk-9/jmods \
@@ -344,7 +344,7 @@ module:
 
 This command exists as `create-minimal-java-runtime.sh` script in the repo earlier checked out from link:https://github.com/PaulSandoz/helloworld-java-9[helloworld-java-9].
 
-The JDK 9 tool `jlink` is used to create the custom Java runtime. Read more jlink in the https://docs.oracle.com/javase/9/tools/jlink.htmp[Tools Reference]. The tool
+The JDK 9 tool `jlink` is used to create the custom Java runtime. Read more jlink in the https://docs.oracle.com/javase/9/tools/jlink.htm[Tools Reference]. The tool
 is executed from with the container containing JDK 9 and directory where the
 modules reside, `/opt/jdk-9/jmods`, is declared in the module path.  Only the
 `java.base` module is selected.
@@ -387,7 +387,7 @@ CMD java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
 Build a Docker image containing the simple Java application based of the Docker
 image `debian:stable-slim`:
 
-    docker build -t helloworld-jdk-9-base -f helloworld-jdk-9-base.Dockerfile .
+    docker image build -t helloworld-jdk-9-base -f helloworld-jdk-9-base.Dockerfile .
 
 List the images available using `docker image ls`:
 

developer-tools/java/chapters/ch03-build-image.adoc

@@ -8,7 +8,7 @@
 
 == Dockerfile
 
-Docker build images by reading instructions from a _Dockerfile_. A _Dockerfile_ is a text document that contains all the commands a user could call on the command line to assemble an image. `docker build` command uses this file and executes all the commands in succession to create an image.
+Docker build images by reading instructions from a _Dockerfile_. A _Dockerfile_ is a text document that contains all the commands a user could call on the command line to assemble an image. `docker image build` command uses this file and executes all the commands in succession to create an image.
 
 `build` command is also passed a context that is used during image creation. This context can be a path on your local filesystem or a URL to a Git repository.
 
@@ -96,7 +96,7 @@ If you do not see the expected output, check your Dockerfile that the content ex
 
 Change the base image from `ubuntu` to `busybox` in `Dockerfile`. Build the image again:
 
-  docker build -t helloworld:2 .
+  docker image build -t helloworld:2 .
 
 and view the images using `docker image ls` command:
 
@@ -172,10 +172,7 @@ Let's package this application as a Docker image.
 
 Run the OpenJDK container in an interactive manner:
 
-[source, text]
-----
-docker run -it openjdk
-----
+    docker container run -it openjdk
 
 This will open a terminal in the container. Check the version of Java:
 
@@ -206,11 +203,11 @@ CMD java -cp /usr/src/helloworld-1.0-SNAPSHOT.jar org.examples.java.App
 
 Build the image:
 
-    docker build -t hello-java:latest .
+    docker image build -t hello-java:latest .
 
 Run the image:
 
-    docker run hello-java:latest
+    docker container run hello-java:latest
 
 This displays the output:
 
@@ -274,7 +271,7 @@ This will show an output like:
 [INFO] DOCKER> [hellojava:latest]: Waited on log out 'Hello World!' 510 ms
 ----
 
-This is similar output when running the Java application using `java` CLI or the Docker container using `docker run` command.
+This is similar output when running the Java application using `java` CLI or the Docker container using `docker container run` command.
 
 The container is running in the foreground. Use `Ctrl` + `C` to interrupt the container and return back to terminal.
 
@@ -342,17 +339,17 @@ Only one change was required in the project to enable Docker packaging and runni
 
 Default entry point for a container is `/bin/sh`, the default shell.
 
-Running a container as `docker run -it ubuntu` uses that command and starts the default shell. The output is shown as:
+Running a container as `docker container run -it ubuntu` uses that command and starts the default shell. The output is shown as:
 
 ```console
-> docker run -it ubuntu
+> docker container run -it ubuntu
 root@88976ddee107:/#
 ```
 
 `ENTRYPOINT` allows to override the entry point to some other command, and even customize it. For example, a container can be started as:
 
 ```console
-> docker run -it --entrypoint=/bin/cat ubuntu /etc/passwd
+> docker container run -it --entrypoint=/bin/cat ubuntu /etc/passwd
 root:x:0:0:root:/root:/bin/bash
 daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
 bin:x:2:2:bin:/bin:/usr/sbin/nologin

developer-tools/java/chapters/ch08-aws.adoc

@@ -59,7 +59,7 @@ It will take a few minutes for the CloudFormation template to complete. The outp
 .Swarm CloudFormation complete
 image::docker-aws-7.png[]
 
-https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#Instances:search=docker;sort=instanceState[EC2 Console] will show the EC2 instances for manager and worker.
+https://console.aws.amazon.com/ec2/v2/home?#Instances:search=docker;sort=instanceState[EC2 Console] will show the EC2 instances for manager and worker.
 
 .EC2 console
 image::docker-aws-8.png[]
@@ -371,7 +371,7 @@ More details about the service can be obtained using `docker -H localhost:2374 s
 ]
 ```
 
-Logs for the service are redirected to CloudWatch and thus cannot be seen using `docker service logs`. This will be fixed with https://github.com/moby/moby/issues/30691[#30691]. Let's view the logs using using https://console.aws.amazon.com/cloudwatch/home?region=us-east-1#logs:prefix=Docker[CloudWatch Logs].
+Logs for the service are redirected to CloudWatch and thus cannot be seen using `docker service logs`. This will be fixed with https://github.com/moby/moby/issues/30691[#30691]. Let's view the logs using using https://console.aws.amazon.com/cloudwatch/home?#logs:prefix=Docker[CloudWatch Logs].
 
 .CloudWatch log group
 image::docker-aws-10.png[]
@@ -390,7 +390,7 @@ image::docker-aws-12.png[]
 
 Application is accessed using manager's IP address and on port 8080. By default, the port 8080 is not open. 
 
-In https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#Instances:search=docker;sort=instanceState[EC2 Console], select an EC2 instance with name `Docker-Manager`, click on `Docker-Managerxxx` in `Security groups`. Click on `Inbound`, `Edit`, `Add Rule`, and create a rule to enable TCP traffic on port 8080.
+In https://console.aws.amazon.com/ec2/v2/home?#Instances:search=docker;sort=instanceState[EC2 Console], select an EC2 instance with name `Docker-Manager`, click on `Docker-Managerxxx` in `Security groups`. Click on `Inbound`, `Edit`, `Add Rule`, and create a rule to enable TCP traffic on port 8080.
 
 .Open port 8080 in Docker manager
 image::docker-aws-13.png[]

developer-tools/java/chapters/ch10-monitoring.adoc

@@ -53,12 +53,25 @@ to see the output:
 +
 ```
 CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
-55198043b6aa        0.12%               267.3MiB / 1.952GiB   13.38%              782B / 0B           0B / 4.1kB          53
-5b5dd33b675d        0.11%               274.2MiB / 1.952GiB   13.72%              782B / 0B           0B / 4.1kB          53
-6e98a9597e6a        0.10%               273.2MiB / 1.952GiB   13.67%              1.03kB / 0B         0B / 4.1kB          51
+1f9d5a1c08a8        0.24%               294.9MiB / 1.952GiB   14.75%              828B / 0B           96.5MB / 4.1kB      115
 ```
 +
-Note that the container id is shown in this case instead of container's name.
+Note that the container id is shown instead of container's name in this case.
++
+. Scale the service to 3 replicas:
++
+```
+docker service scale web=3
+```
++
+. The stats are now shown for all three containers:
++
+```
+CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O           PIDS
+1f9d5a1c08a8        0.14%               287.8MiB / 1.952GiB   14.40%              1.03kB / 0B         96.5MB / 4.1kB      53
+a3395efbb6ff        0.77%               263.4MiB / 1.952GiB   13.18%              578B / 0B           0B / 4.1kB          114
+f484ff2f4c12        0.06%               294.8MiB / 1.952GiB   14.75%              578B / 0B           0B / 4.1kB          114
+```
 +
 . Display only container id and percent CPU utilization using the command `docker container stats --format "{{.Container}}: {{.CPUPerc}}"`:
 +
@@ -802,7 +815,7 @@ This section will explain how to start Grafana, use Prometheus as the data sourc
 . Start Grafana:
 +
 ```
-docker run \
+docker container run \
   -d \
   -p 3000:3000 \
   --name=grafana \

developer-tools/java/scripts/docker-compose-pull-images.yml

@@ -19,10 +19,16 @@ services:
   jenkins:
     image: tailtarget/jenkins:2.32.3
   prometheus:
-    image: prom/prometheus
+    image: prom/prometheus:latest
   node-exporter:
     image: prom/node-exporter
   cadvisor:
     image: google/cadvisor:latest
   grafana:
     image: grafana/grafana
+  debian:
+    image: debian:stable-slim
+  alpine:
+    image: alpine:3.6
+  openjdk-slim:
+    image: openjdk:9-jdk-slim