Fix format and generate new html content

Author: rafabene

chapters/docker-compose.adoc

@@ -152,7 +152,7 @@ mysqldb_1   | 2015-06-05 15:40:18 1 [Warning] IP address '172.17.0.24' could not
 NOTE: Use the port displayed in the `docker-compose ps` command.
 
 .Output From Servers Run Using Docker Compose
-image::docker-compose-output.png[]
+image::images/docker-compose-output.png[]
 
 ### Scale Services
 

chapters/docker-container-linking.adoc

@@ -12,9 +12,11 @@ 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 mysql #From Internet
+#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 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 classroom.example.com:5000/mysql #From Instructor
+#From Instructor
+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 
 ----
 +
 `-e` define environment variables that are read by the database at startup and allow us to access the database with this user and password.
@@ -23,9 +25,11 @@ 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 arungupta/wildfly-mysql-javaee7 #From Internet
+#From Internet
+docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 arungupta/wildfly-mysql-javaee7 
 
-docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 classroom.example.com:5000/wildfly-mysql-javaee7 #From Instructor
+#From Instructor
+docker run -d --name mywildfly-mysql --link mysqldb:db -p 8080:8080 classroom.example.com:5000/wildfly-mysql-javaee7 
 ----
 +
 `--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.adoc

@@ -23,8 +23,11 @@ Now, let's get a vanilla `jboss/wildfly` image:
 
 [source, text]
 ----
-docker pull jboss/wildfly:latest #From Internet
-docker pull classroom.example.com:5000/wildfly:latest #From Instructor
+#From Internet
+docker pull jboss/wildfly:latest 
+
+#From Instructor
+docker pull classroom.example.com:5000/wildfly:latest 
 ----
 
 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.
@@ -75,8 +78,11 @@ To run the WildFly container in an interactive mode.
 
 [source, text]
 ----
-docker run -it jboss/wildfly #From Internet
-docker run -it classroom.example.com:5000/wildfly #From Instructor
+#From Internet
+docker run -it jboss/wildfly 
+
+#From Instructor
+docker run -it classroom.example.com:5000/wildfly 
 ----
 
 This will show the output as:
@@ -123,8 +129,11 @@ Restart the container in detached mode:
 
 [source, text]
 ----
-docker run --name mywildfly -d jboss/wildfly #From Internet
-docker run --name mywildfly -d classroom.example.com:5000/wildfly #From Instructor
+#From Internet
+docker run --name mywildfly -d jboss/wildfly 
+
+#From Instructor
+docker run --name mywildfly -d classroom.example.com:5000/wildfly 
 
 972f51cc8422eec0a7ea9a804a55a2827b5537c00a6bfd45f8646cb764bc002a
 ----
@@ -182,8 +191,11 @@ Restart the container as:
 
 [source, text]
 ----
-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
+#From Internet
+docker run --name mywildfly-exposed-ports -d -P jboss/wildfly 
+
+#From Instructor
+docker run --name mywildfly-exposed-ports -d -P classroom.example.com:5000/wildfly 
 ----
 
 `-P` map any exposed ports inside the image to a random port on the Docker host. This can be verified as:
@@ -212,8 +224,11 @@ Restart the container as:
 
 [source, text]
 ----
-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
+#From Internet
+docker run --name mywildfly-mapped-ports -d -p 8080:8080 jboss/wildfly 
+
+#From Instructor
+docker run --name mywildfly-mapped-ports -d -p 8080:8080 classroom.example.com:5000/wildfly 
 ----
 
 The format is `-p hostPort:containerPort`. This option maps container ports to host ports and allows other containers on our host to access them.
@@ -248,17 +263,22 @@ The following command will override the default command in Docker file, start Wi
 
 [source, text]
 ----
-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
+#From Internet
+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 
 
-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
+#From Instructor
+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 
 ----
 
 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 rafabene/wildfly-admin #From Internet
-docker run --name managed-wildfly-from-image -P -d classroom.example.com:5000/wildfly-management #From Instructor
+#From Internet
+docker run --name managed-wildfly-from-image -P -d rafabene/wildfly-admin 
+
+#From Instructor
+docker run --name managed-wildfly-from-image -P -d classroom.example.com:5000/wildfly-management
 ----
 
 `-P` map any exposed ports inside the image to a random port on Docker host.
@@ -325,8 +345,11 @@ 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 rafabene/wildfly-admin #From Internet
-docker run -p 8080:8080 -p 9990:9990 -d classroom.example.com:5000/wildfly-management #From Instructor
+#From Internet
+docker run -p 8080:8080 -p 9990:9990 -d rafabene/wildfly-admin 
+
+#From Instructor
+docker run -p 8080:8080 -p 9990:9990 -d classroom.example.com:5000/wildfly-management 
 ----
 
 In this case, Docker port mapping will be shown as:

chapters/docker-deployment-options.adoc

@@ -9,8 +9,11 @@ We're going to build the application first.
 
 . Clone the repo:
 
-  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
+  #From Internet
+  git clone https://github.com/javaee-samples/javaee7-simple-sample.git 
+  
+  #From Instructor
+  git clone http://root:dockeradmin@classroom.example.com:10080/root/javaee7-simple-sample.git 
 
 
 . Build the application:
@@ -42,9 +45,11 @@ Start WildFly server as:
 
 [source, text]
 ----
-docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw jboss/wildfly #From Internet
+#From Internet
+docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw jboss/wildfly 
 
-docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw classroom.example.com:5000/wildfly #From Instructor
+#From Instructor
+docker run --name wildfly -d -p 8080:8080 -v `pwd`/deployments:/opt/jboss/wildfly/standalone/deployments/:rw classroom.example.com:5000/wildfly 
 ----
 
 [NOTE]
@@ -145,8 +150,11 @@ Start WildFly server as:
 
 [source, text]
 ----
-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
+#From Internet
+docker run --name wildfly-managed -d -p 8080:8080 -p 9990:9990 rafabene/wildfly-admin 
+
+#From Instructor
+docker run --name wildfly-managed -d -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management 
 ----
 
 This command starts a container named "`wildfly-managed`".
@@ -223,8 +231,11 @@ 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 rafabene/wildfly-admin #From Internet
-docker run -d --name wildfly -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management #From Instructor
+#From Internet
+docker run -d --name wildfly -p 8080:8080 -p 9990:9990 rafabene/wildfly-admin 
+
+#From Instructor
+docker run -d --name wildfly -p 8080:8080 -p 9990:9990 classroom.example.com:5000/wildfly-management 
 ----
 +
 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.

chapters/docker-javaee7.adoc

@@ -10,8 +10,11 @@ Pull the Docker image that contains WildFly and pre-built Java EE 7 application
 
 [source, text]
 ----
-docker pull arungupta/javaee7-hol #From Internet
-docker pull classroom.example.com:5000/javaee7-hol #From Instructor
+#From Internet
+docker pull arungupta/javaee7-hol 
+
+#From Instructor
+docker pull classroom.example.com:5000/javaee7-hol
 ----
 
 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.
@@ -20,8 +23,11 @@ Run it:
 
 [source, text]
 ----
-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
+#From Internet
+docker run -it -p 8080:8080 arungupta/javaee7-hol 
+
+#From Instructor
+docker run -it -p 8080:8080 classroom.example.com:5000/javaee7-hol 
 ----
 
 See the application in action at http://dockerhost:8080/movieplex7/. The output is shown:

chapters/docker-setup.adoc

@@ -7,7 +7,7 @@ This section describes what, how, and where to install the software needed for t
 . Operating System: Mac OS X (10.8 or later), Windows 7 (SP1), Fedora (21 or later)
 . Memory: At least 4 GB+, preferred 8 GB
 
-### Environment
+### Environment (Just needed if you are running with Instructor support)
 
 #### DNS Server setup Windows
 
@@ -53,9 +53,9 @@ You can find GIT for Windows at: http://classroom.example.com:8082/downloads/Git
 
 Docker currently runs natively on Linux. It can be configured to run in a virtual machine on Mac or Windows. This is why Virtualbox is a requirement for Mac or Windows.
 
-Downloads are available
-. from Internet: https://www.virtualbox.org/wiki/Downloads .
-. from Instructor: http://classroom.example.com:8082/downloads/virtualbox/ .
+. Downloads are available
+.. from Internet: https://www.virtualbox.org/wiki/Downloads .
+.. from Instructor: http://classroom.example.com:8082/downloads/virtualbox/ .
 
 [WARNING]
 ====
@@ -68,9 +68,9 @@ Linux Users
 
 ### Vagrant
 
-Download Vagrant 
-. from Internet: https://www.vagrantup.com/downloads.html
-. from Instructor: http://classroom.example.com:8082/downloads/vagrant/ 
+. Download Vagrant 
+.. from Internet: https://www.vagrantup.com/downloads.html
+.. from Instructor: http://classroom.example.com:8082/downloads/vagrant/ 
 and install.
 
 ### Docker Machine
@@ -111,42 +111,40 @@ docker-machine create --driver=virtualbox lab
 eval "$(docker-machine env lab)"
 ----
 
-
 . Or Create Docker Host to be used in the lab with an Instructor:
-+
 [source, text]
 ----
 docker-machine create --driver=virtualbox --virtualbox-boot2docker-url=http://classroom.example.com:8082/downloads/boot2docker.iso --engine-insecure-registry=classroom.example.com:5000 lab
 
 eval "$(docker-machine env lab)"
 ----
-+
+
 Use the following command on Windows:
-+
+
 [source, text]
 ----
 docker-machine env lab --shell cmd
 ----
-+
+
 And then execute all the `set` commands.
-+
+
 . 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 machine:
-+
+
 [source, text]
 ----
 docker-machine ip lab
 ----
-+
+
 This will provide the IP address associated with the Docker Machine created earlier.
-+
+
 . Edit `C:\Windows\System32\drivers\etc\hosts` (Windows) or `/etc/hosts` (Mac OS or Linux) and add:
-+
+
 [source, text]
 ----
 <IP ADDRESS>  dockerhost
 ----
 . Check if the entry is working:
-+
+
 [source, text]
 ----
 ping dockerhost
@@ -204,10 +202,10 @@ To install JBoss Developer Studio stand-alone, complete the following steps:
 . From Instructor: http://classroom.example.com:8082/downloads/jboss-devstudio-9.0.0.GA-installer-standalone.jar .
 
 . Start the installer as:
-+
+
 [source, text]
 ----
 java -jar <JAR FILE NAME>
 ----
-+
+
 Follow the on-screen instructions to complete the installation process.