Fix #10 - Show an alternative path to run the lab using images from Docker Hub

Author: rafabene

attendees/docker-compose.yml attendees/docker-compose-instructor.ymlattendees/docker-compose.yml renamed to attendees/docker-compose-instructor.yml

@@ -0,0 +1,14 @@
+mysqldb:
+  image: classroom.example.com:5000/mysql
+  environment:
+    MYSQL_DATABASE: sample
+    MYSQL_USER: mysql
+    MYSQL_PASSWORD: mysql
+    MYSQL_ROOT_PASSWORD: supersecret
+mywildfly:
+  image: classroom.example.com:5000/wildfly-mysql-javaee7
+  links:
+    - mysqldb:db
+  ports:
+    - 8080
+  

attendees/docker-compose-internet.yml

@@ -24,7 +24,7 @@ Docker has three main components:
 In order for these three components to work together, there is *Docker Daemon* that runs on a host machine and does the heavy lifting of building, running, and distributing Docker containers. In addition, there is *Client* that is a Docker binary which accepts commands from the user and communicates back and forth with the daemon.
 
 .Docker architecture
-image::docker-architecture.png[]
+image::images/docker-architecture.png[]
 
 Client communicates with Daemon, either co-located on the same host, or on a different host. It requests the Daemon to pull an image from the repository using `pull` command. The Daemon then downloads the image from Docker Hub, or whatever registry is configured. Multiple images can be downloaded from the registry and installed on Daemon host. Images are run using `run` command to create containers on demand.
 

chapters/docker-basics.adoc

@@ -43,21 +43,21 @@ chmod +x /usr/local/bin/docker-compose
 [source, yml]
 ----
 mysqldb:
-  image: classroom.example.com:5000/mysql
+  image: [classroom.example.com:5000/]mysql
   environment:
     MYSQL_DATABASE: sample
     MYSQL_USER: mysql
     MYSQL_PASSWORD: mysql
     MYSQL_ROOT_PASSWORD: supersecret
 mywildfly:
-  image: classroom.example.com:5000/wildfly-mysql-javaee7
+  image: [classroom.example.com:5000|arungupta]/wildfly-mysql-javaee7
   links:
     - mysqldb:db
   ports:
     - 8080
 ----
 +
-This file is available in https://raw.githubusercontent.com/redhat-developer/docker-java/javaone2015/attendees/docker-compose.yml[] and shows:
+This file is available in https://raw.githubusercontent.com/redhat-developer/docker-java/javaone2015/attendees/[] and shows:
 +
 .. Two services defined by the name `mysqldb` and `mywildfly`
 .. Image name for each service defined using `image`
@@ -67,6 +67,9 @@ This file is available in https://raw.githubusercontent.com/redhat-developer/doc
 
 ### Start Services
 
+. Save the `docker-compose-internet.yml` as `docker-compose.yml` if you are running from Internet or 
+. Save the `docker-compose-instructor.yml` as `docker-compose.yml` if you are using images from Instructor.
+
 . All services can be started, in detached mode, by giving the command:
 +
   docker-compose up -d
@@ -100,7 +103,7 @@ Alternatively, the containers in this application, and any additional containers
 > docker ps
 CONTAINER ID        IMAGE                                    COMMAND                CREATED             STATUS              PORTS                              NAMES
 3598e545bd2f        arungupta/wildfly-mysql-javaee7:latest   "/opt/jboss/wildfly/   59 seconds ago      Up 58 seconds       0.0.0.0:32773->8080/tcp         attendees_mywildfly_1   
-b8cf6a3d518b        mysql:latest                             "/entrypoint.sh mysq   2 minutes ago       Up 2 minutes        3306/tcp                      attendees_mysqldb_1  
+b8cf6a3d518b        mysql:latest                             "/entrypoint.sh mysq   2 minutes ago       Up 2 minutes        3306/tcp                        attendees_mysqldb_1  
 ----
 +
 . Service logs can be seen as:

chapters/docker-compose.adoc

@@ -12,7 +12,9 @@ This section will show how https://docs.docker.com/userguide/dockerlinks/[Docker
 +
 [source, text]
 ----
-docker run --name mysqldb -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -e MYSQL_DATABASE=sample -e MYSQL_ROOT_PASSWORD=supersecret -p 3306:3306 -d classroom.example.com:5000/mysql
+docker run --name mysqldb -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -e MYSQL_DATABASE=sample -e MYSQL_ROOT_PASSWORD=supersecret -p 3306:3306 -d mysql #From Internet
+
+docker run --name mysqldb -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -e MYSQL_DATABASE=sample -e MYSQL_ROOT_PASSWORD=supersecret -p 3306:3306 -d classroom.example.com:5000/mysql #From Instructor
 ----
 +
 `-e` define environment variables that are read by the database at startup and allow us to access the database with this user and password.
@@ -21,7 +23,9 @@ docker run --name mysqldb -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -e MYSQL_D
 +
 [source, text]
 ----
-docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 classroom.example.com:5000/wildfly-mysql-javaee7
+docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 arungupta/wildfly-mysql-javaee7 #From Internet
+
+docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 classroom.example.com:5000/wildfly-mysql-javaee7 #From Instructor
 ----
 +
 `--link` takes two parameters - first is name of the container we're linking to and second is the alias for the link name.

chapters/docker-container-linking.adoc

@@ -16,14 +16,15 @@ At first, this list only contains the Docker swarm image, we used earlier.
 [source, text]
 ----
 REPOSITORY                           TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-classroom.example.com:5000/swarm     latest              556c60f87888        33 hours ago        10.2 MB----
+swarm     latest              556c60f87888        33 hours ago        10.2 MB
 ----
 
 Now, let's get a vanilla `jboss/wildfly` image:
 
 [source, text]
 ----
-docker pull classroom.example.com:5000/wildfly:latest
+docker pull jboss/wildfly:latest #From Internet
+docker pull classroom.example.com:5000/wildfly:latest #From Instructor
 ----
 
 By default, docker images are retrieved from https://hub.docker.com/[Docker Hub]. In our case, we're providing a so called private registry via the instructor laptop.
@@ -59,9 +60,9 @@ When the download is done, you can list the images again and will see the follow
 [source, text]
 ----
 docker images
-REPOSITORY                           TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-classroom.example.com:5000/wildfly   latest              7688aaf382ab        6 weeks ago         581.4 MB
-classroom.example.com:5000/swarm     latest              207e8b983242        9 weeks ago         10.2 MB
+REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
+jboss/wildfly       latest              7688aaf382ab        6 weeks ago         581.4 MB
+swarm               latest              207e8b983242        9 weeks ago         10.2 MB
 ----
 
 ### Run Container
@@ -74,7 +75,8 @@ To run the WildFly container in an interactive mode.
 
 [source, text]
 ----
-docker run -it classroom.example.com:5000/wildfly
+docker run -it jboss/wildfly #From Internet
+docker run -it classroom.example.com:5000/wildfly #From Instructor
 ----
 
 This will show the output as:
@@ -121,7 +123,9 @@ Restart the container in detached mode:
 
 [source, text]
 ----
-docker run --name mywildfly -d classroom.example.com:5000/wildfly
+docker run --name mywildfly -d jboss/wildfly #From Internet
+docker run --name mywildfly -d classroom.example.com:5000/wildfly #From Instructor
+
 972f51cc8422eec0a7ea9a804a55a2827b5537c00a6bfd45f8646cb764bc002a
 ----
 
@@ -146,8 +150,8 @@ We can check it by issuing the `docker ps` command which retrieves the images pr
 [source, text]
 ----
 > docker ps
-CONTAINER ID        IMAGE                                COMMAND                CREATED              STATUS              PORTS               NAMES
-7da1c7614edf        classroom.example.com:5000/wildfly   "/opt/jboss/wildfly/   About a minute ago   Up About a minute   8080/tcp            mywildfly
+CONTAINER ID        IMAGE               COMMAND                CREATED              STATUS              PORTS               NAMES
+7da1c7614edf        jboss/wildfly       "/opt/jboss/wildfly/   About a minute ago   Up About a minute   8080/tcp            mywildfly
 ----
 
 Noticed the "NAMES" column? This is a quick way of refering to your container. Let's try to look at the logs again:
@@ -178,16 +182,17 @@ Restart the container as:
 
 [source, text]
 ----
-docker run --name mywildfly-exposed-ports -d -P classroom.example.com:5000/wildfly
+docker run --name mywildfly-exposed-ports -d -P jboss/wildfly #From Internet
+docker run --name mywildfly-exposed-ports -d -P classroom.example.com:5000/wildfly #From Instructor
 ----
 
 `-P` map any exposed ports inside the image to a random port on the Docker host. This can be verified as:
 
 [source, text]
 ----
 > docker ps
-CONTAINER ID        IMAGE                                    COMMAND                CREATED             STATUS              PORTS                     NAMES
-7f41a5a0cfd6        classroom.example.com:5000/wildfly   "/opt/jboss/wildfly/   52 seconds ago      Up 52 seconds       0.0.0.0:32768->8080/tcp   mywildfly-exposed-ports
+CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS              PORTS                     NAMES
+7f41a5a0cfd6        jboss/wildfly      "/opt/jboss/wildfly/   52 seconds ago      Up 52 seconds       0.0.0.0:32768->8080/tcp   mywildfly-exposed-ports
 ----
 
 The port mapping is shown in the `PORTS` column. Access the WildFly server at http://dockerhost:32768. Make sure to use the correct port number as shown in your case.
@@ -207,7 +212,8 @@ Restart the container as:
 
 [source, text]
 ----
-docker run --name mywildfly-mapped-ports -d -p 8080:8080 classroom.example.com:5000/wildfly
+docker run --name mywildfly-mapped-ports -d -p 8080:8080 jboss/wildfly #From Internet
+docker run --name mywildfly-mapped-ports -d -p 8080:8080 classroom.example.com:5000/wildfly #From Instructor
 ----
 
 The format is `-p hostPort:containerPort`. This option maps container ports to host ports and allows other containers on our host to access them.
@@ -242,14 +248,17 @@ The following command will override the default command in Docker file, start Wi
 
 [source, text]
 ----
-docker run --name managed-wildfly -P -d classroom.example.com:5000/wildfly /opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0
+docker run --name managed-wildfly -P -d jboss/wildfly /opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0 #From Internet
+
+docker run --name managed-wildfly -P -d classroom.example.com:5000/wildfly /opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0 #From Instructor
 ----
 
 Accessing WildFly Administration Console require a user in administration realm. A pre-created image, with appropriate username/password credentials, is used to start WildFly as:
 
 [source, text]
 ----
-docker run --name managed-wildfly-from-image -P -d classroom.example.com:5000/wildfly-management
+docker run --name managed-wildfly-from-image -P -d rafabene/wildfly-admin #From Internet
+docker run --name managed-wildfly-from-image -P -d classroom.example.com:5000/wildfly-management #From Instructor
 ----
 
 `-P` map any exposed ports inside the image to a random port on Docker host.
@@ -259,9 +268,9 @@ Look at the exposed ports as:
 [source, text]
 ----
 docker ps
-CONTAINER ID        IMAGE                                           COMMAND                CREATED             STATUS              PORTS                                              NAMES
-5fdedef5573b        classroom.example.com:5000/wildfly-management   "/bin/sh -c '/opt/jb   15 seconds ago      Up 15 seconds       0.0.0.0:32772->8080/tcp, 0.0.0.0:32771->9990/tcp   managed-wildfly-from-image
-ee30433b5414        classroom.example.com:5000/wildfly              "/opt/jboss/wildfly/   59 seconds ago      Up 59 seconds       0.0.0.0:32769->8080/tcp                            managed-wildfly
+CONTAINER ID        IMAGE                       COMMAND                CREATED             STATUS              PORTS                                                       NAMES
+5fdedef5573b        rafabene/wildfly-admin      "/bin/sh -c '/opt/jb   15 seconds ago      Up 15 seconds       0.0.0.0:32772->8080/tcp, 0.0.0.0:32771->9990/tcp   managed-wildfly-from-image
+ee30433b5414        jboss/wildfly               "/opt/jboss/wildfly/   59 seconds ago      Up 59 seconds       0.0.0.0:32769->8080/tcp                            managed-wildfly
 ----
 
 Look for the host port that is mapped in the container, `32769` in this case. Access the admin console at http://dockerhost:32769.
@@ -316,7 +325,8 @@ This management image can also be started with a pre-defined port mapping as:
 
 [source, text]
 ----
-docker run -p 8080:8080 -p 9990:9990 -d classroom.example.com:5000/wildfly-management
+docker run -p 8080:8080 -p 9990:9990 -d rafabene/wildfly-admin #From Internet
+docker run -p 8080:8080 -p 9990:9990 -d classroom.example.com:5000/wildfly-management #From Instructor
 ----
 
 In this case, Docker port mapping will be shown as:

chapters/docker-container.adoc

@@ -9,13 +9,20 @@ We're going to build the application first.
 
 . Clone the repo:
 
-  git clone http://root:dockeradmin@classroom.example.com:10080/root/javaee7-simple-sample.git
+  git clone https://github.com/javaee-samples/javaee7-simple-sample.git #From Internet
+  git clone http://root:dockeradmin@classroom.example.com:10080/root/javaee7-simple-sample.git #From Instructor
+
 
 . Build the application:
 
 [source, text]
 ----
   cd javaee7-simple-sample/
+  
+  #From Internet
+  mvn clean package
+    
+  #From Instructor
   curl http://classroom.example.com:8082/downloads/lab-settings.xml -o settings.xml
   mvn -s settings.xml clean package
 ----
@@ -35,14 +42,16 @@ Start WildFly server as:
 
 [source, text]
 ----
-docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw classroom.example.com:5000/wildfly
+docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw jboss/wildfly #From Internet
+
+docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw classroom.example.com:5000/wildfly #From Instructor
 ----
 
 [NOTE]
 ====
 Windows users need to tweak this a bit and copy the deployments to c:/Users/<USER>/deployments because the directory mappings for boot2docker work differently on those systems. Please update the docker -v argument accordingly.
 
-'docker run --name wildfly -d -p 8080:8080 -v /c/Users/meisele/deployments:/opt/jboss/wildfly/standalone/deployments/:rw classroom.example.com:5000/wildfly'
+'docker run --name wildfly -d -p 8080:8080 -v /c/Users/meisele/deployments:/opt/jboss/wildfly/standalone/deployments/:rw [classroom.example.com:5000|jboss]/wildfly'
 ====
 
 This command starts a container named "`wildfly`".
@@ -136,26 +145,27 @@ Start WildFly server as:
 
 [source, text]
 ----
-docker run --name wildfly-managed -d -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly
+docker run --name wildfly-managed -d -p 8080:8080 -p 9990:9990 rafabene/wildfly-admin #From Internet
+docker run --name wildfly-managed -d -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management #From Instructor
 ----
 
 This command starts a container named "`wildfly-managed`".
 
-+
+
 [source, text]
 ----
 jboss-cli.sh --controller=dockerhost:9990  -u=admin -p=docker#admin -c
 ----
-+
+
 This will show the output as:
-+
+
 [source, text]
 ----
 [standalone@dockerhost:9990 /]
 ----
-+
+
 . Deploy the application as:
-+
+
 [source, text]
 ----
 deploy <javaee7-simple-sample PATH>target/javaee7-simple-sample-1.10.war --force
@@ -213,7 +223,8 @@ A standalone WildFly process, process can be configured to listen for remote man
 +
 [source, text]
 ----
-docker run -d --name wildfly -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management
+docker run -d --name wildfly -p 8080:8080 -p 9990:9990 rafabene/wildfly-admin #From Internet
+docker run -d --name wildfly -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management #From Instructor
 ----
 +
 In addition to application port 8080, the administration port 9990 is exposed as well. The WildFly image that is used has tweaked the start script such that the management interface is bound to 0.0.0.0.
@@ -225,7 +236,7 @@ image::images/jbds8.png[]
 . Click on '`Next>`' and change the values as shown.
 +
 .Create New Server Adapter
-image::jbds9.png[]
+image::images/jbds9.png[]
 +
 . Take the default values in '`Remote System Integration`' and click on '`Finish`'.
 +

chapters/docker-deployment-options.adoc

@@ -10,7 +10,8 @@ Pull the Docker image that contains WildFly and pre-built Java EE 7 application
 
 [source, text]
 ----
-docker pull classroom.example.com:5000/javaee7-hol
+docker pull arungupta/javaee7-hol #From Internet
+docker pull classroom.example.com:5000/javaee7-hol #From Instructor
 ----
 
 The https://github.com/arun-gupta/docker-images/blob/master/javaee7-hol/Dockerfile[javaee7-hol Dockerfile] is based on `jboss/wildfly` and adds the movieplex7 application as war file.
@@ -19,7 +20,8 @@ Run it:
 
 [source, text]
 ----
-docker run -it -p 8080:8080 classroom.example.com:5000/javaee7-hol
+docker run -it -p 8080:8080 arungupta/javaee7-hol #From Internet
+docker run -it -p 8080:8080 classroom.example.com:5000/javaee7-hol #From Instructor
 ----
 
 See the application in action at http://dockerhost:8080/movieplex7/. The output is shown: