Various fixes and improvements

Author: rafabene

chapters/docker-compose.adoc

@@ -43,19 +43,19 @@ sudo chmod +x /usr/local/bin/docker-compose
 [source, yml]
 ----
 mysqldb:
-  #From Internet
+  #From Internet (use only one image instruction)
   image: mysql
-  #From Instructor
+  #From Instructor (use only one image instruction)
   image: classroom.example.com:5000/mysql
   environment:
     MYSQL_DATABASE: sample
     MYSQL_USER: mysql
     MYSQL_PASSWORD: mysql
     MYSQL_ROOT_PASSWORD: supersecret
 mywildfly:
-  #From Internet
+  #From Internet (use only one image instruction)
   image: arungupta/wildfly-mysql-javaee7
-  #From Instructor
+  #From Instructor (use only one image instruction)
   image: classroom.example.com:5000/wildfly-mysql-javaee7
   links:
     - mysqldb:db

chapters/docker-container.adoc

@@ -11,12 +11,12 @@ Let's first check, if any images are available:
 docker images
 ----
 
-At first, this list only contains the Docker swarm image, we used earlier.
+At first, this list is empty.
 
 [source, text]
 ----
-REPOSITORY                           TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-swarm     latest              556c60f87888        33 hours ago        10.2 MB
+REPOSITORY              TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
+
 ----
 
 Now, let's get a vanilla `jboss/wildfly` image:
@@ -254,21 +254,21 @@ image::images/plain-wildfly1.png[]
 ### Stop Container
 
 . Stop a specific container:
-+
+
 [source, text]
 ----
 docker stop <CONTAINER ID>
 ----
-+
+
 . Stop all the running containers
-+
+
 [source, text]
 ----
 docker stop $(docker ps -q)
 ----
-+
+
 . Stop only the exited containers
-+
+
 [source, text]
 ----
 docker ps -a -f "exited=-1"
@@ -277,25 +277,26 @@ docker ps -a -f "exited=-1"
 ### Remove Container
 
 . Remove a specific container:
-+
+
 [source, text]
 ----
 docker rm 0bc123a8ece0
 ----
-+
+
 . Remove containers meeting a regular expression
-+
+
 [source, text]
 ----
 docker ps -a | grep wildfly | awk '{print $1}' | xargs docker rm
 ----
-+
+
 . Remove all containers, without any criteria
-+
+
 [source, text]
 ----
 docker rm $(docker ps -aq)
 ----
+
 [[Enabling_WildFly_Administration]]
 ### Enabling WildFly Administration
 

chapters/docker-deployment-options.adoc

@@ -11,7 +11,7 @@ We're going to build the application first.
 
   #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 
 
@@ -79,36 +79,36 @@ Now you're ready to deploy the application for the first time.
 Start JBoss Developer Studio, if not already started.
 
 . Select '`Servers`' tab, create a new server adapter
-+
+
 .Server adapter
 image::images/jbds1.png[]
-+
+
 . Assign an existing or create a new WildFly 9.0.0 runtime (changed properties are highlighted.)
-+
+
 .WildFly Runtime Properties
 image::images/jbds2.png[]
-+
+
 . If a new runtime needs to be created, pick the directory for WildFly 9.0.2:
-+
+
 .WildFly 9.0.2.Final Runtime
 image::images/jbds3.png[]
-+
+
 Click on '`Finish`'.
-+
+
 . Double-click on the newly selected server to configure server properties:
-+
+
 .Server properties
 image::images/jbds4.png[]
-+
+
 The host name is specified to '`dockerhost`'. Two properties on the left are automatically propagated from the previous dialog. Additional two properties on the right side are required to disable to keep deployment scanners in sync with the server.
-+
+
 . Specify a custom deployment folder on Deployment tab of Server Editor
-+
+
 .Custom deployment folder
 image::images/jbds5.png[]
-+
+
 . Right-click on the newly created server adapter and click '`Start`'.
-+
+
 .Started server
 image::images/jbds6.png[]
 
@@ -142,7 +142,7 @@ TThe Command Line Interface (CLI) is a tool for connecting to WildFly instances
 Lets use the CLI to deploy javaee7-simple-sample to WildFly running in the container.
 
 . CLI needs to be locally installed and comes as part of WildFly. This should be available in the previously downloaded WildFly. Unzip into a folder of your choice (e.g. `/Users/<USER>/tools/`). This will create `wildfly-9.0.2.Final` directory here. This folder is referred to $WIDLFY_HOME from here on. Make sure to add the `/Users/<USER>/tools/wildfly-9.0.2.Final/bin` to your $PATH.
-+
+
 . Run the "`wildfly-management`" image with fixed port mapping as explained in <<Management_Fixed_Port_Mapping>>.
 . Run the `jboss-cli` command and connect to the WildFly instance.
 
@@ -200,21 +200,21 @@ Start a new container as `docker run -d --name wildfly -p 8080:8080 -p 9990:9990
 Deploy the application using the console with the following steps:
 
 . Go to '`Deployments`' tab.
-+
+
 .Deployments tab in WildFly Web Console
 image::images/wildfly9-deployments-tab.png[]
-+
+
 . Click on '`Add`' button.
 . On '`Add Deployment`' screen, take the default of '`Upload a new deployment`' and click '`Next>>`'.
 . Click on '`Choose File`', select `<javaee7-simple-sample PATH>/javaee7-simple-sample.war` file on your computer. This would be `javaee7-simple-sample/target/javaee7-simple-sample.war` from <<Build_Application>>.
 . Click on '`Next>>`'.
 . Select '`Enable`' checkbox.
-+
+
 .Enable a deployment
 image::images/wildfly9-add-deployments.png[]
-+
+
 . Click '`Finish`'.
-+
+
 .Java EE 7 Simple Sample Deployed
 image::images/wildfly9-javaee7-simple-sample-deployed.png[]
 
@@ -228,7 +228,7 @@ image::images/wildfly9-javaee7-simple-sample-output.png[]
 A standalone WildFly process, process can be configured to listen for remote management requests using its "`native management interface`". The CLI tool that comes with the application server uses this interface, and user can develop custom clients that use it as well. By default, WildFly management interface listens on 127.0.0.1. When running inside a Docker container, the network interface should be bound to all publicly assigned addresses. This can be easily changed by biding to 0.0.0.0 instead of 127.0.0.1.
 
 . Start another WildFly instance again:
-+
+
 [source, text]
 ----
 #From Internet
@@ -237,33 +237,33 @@ 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.
-+
+
 . Create a new server adapter in JBoss Developer Studio and name it "`WildFly 9.0.2-Management`". Specify the host name as '`dockerhost`'.
-+
+
 image::images/jbds8.png[]
-+
+
 . Click on '`Next>`' and change the values as shown.
-+
+
 .Create New Server Adapter
 image::images/jbds9.png[]
-+
+
 . Take the default values in '`Remote System Integration`' and click on '`Finish`'.
-+
+
 . Change server properties by double clicking on the newly created server adapter. Specify admin credentials (username: docker, password: docker#admin). Note, you need to delete the existing password and use this instead:
-+
+
 .Management Login Credentials
 image::images/jbds10.png[]
-+
+
 . Right-click on the newly created server adapter and click '`Start`'. Status quickly changes to '`Started`' as shown.
-+
+
 .Synchronized WildFly Server
 image::images/jbds11.png[]
-+
+
 . Right-click on the javaee7-simple-sample project, select '`Run on Server`' and choose this server. The project runs and displays the start page of the application.
 . Stop WildFly when you're done.
-+
+
 [source, text]
 ----
 docker stop wildfly

chapters/docker-image.adoc

@@ -31,10 +31,10 @@ _Dockerfile_ is usually called _Dockerfile_. The complete list of commands that
 
 [source, text]
 ----
-#From Internet
+#From Internet (use only one FROM instruction)
 FROM fedora
 
-#From Instructor
+#From Instructor (use only one FROM instruction)
 FROM classroom.example.com:5000/fedora
 
 CMD ["/bin/echo", "hello world"]
@@ -102,10 +102,10 @@ busybox             latest              c51f86c28340        8 days ago
 
 [source, text]
 ----
-#From Internet
+#From Internet (use only one FROM instruction)
 FROM jboss/wildfly
 
-#From Instructor
+#From Instructor (use only one FROM instruction)
 FROM classroom.example.com:5000/wildfly
 ----
 

chapters/docker-kubernetes.adoc

@@ -1,5 +1,23 @@
 ## Deploy Application on Kubernetes Cluster
 
+[[Kubernetes_Setup]]
+### Install Kubernetes
+
+. Download Vagrant and install it.
+.. from Internet: https://www.vagrantup.com/downloads.html 
+.. from Instructor: http://classroom.example.com:8082/downloads/vagrant/ 
+
++
+Kubernetes requires Vagrant >= 1.6.2. So if you have an older version then make sure you install the latest one.
++
+. If you've not installed Docker Toolbox, then you need to additionally download Virtual Box 5.0.8 
+.. from Internet: https://www.virtualbox.org/wiki/Downloads.
+.. from Instructor: http://classroom.example.com:8082/downloads/virtualbox/
+
+. Download Kubernetes (1.0.7) 
+.. from Internet: https://github.com/kubernetes/kubernetes/releases/download/v1.0.7/kubernetes.tar.gz 
+.. from Instructor: http://classroom.example.com:8082/downloads/kubernetes.tar.gz.
+
 [quote, github.com/GoogleCloudPlatform/kubernetes/]
 Kubernetes is an open source system for managing containerized applications across multiple hosts, providing basic mechanisms for deployment, maintenance, and scaling of applications.
 
@@ -45,12 +63,15 @@ Kubernetes cluster can be easily started using Vagrant. There are two options to
 [source, text]
 ----
 cd kubernetes
+export NUM_MINIONS=2
 export KUBERNETES_PROVIDER=vagrant
 ./cluster/kube-up.sh
 ----
 
 The `KUBERNETES_PROVIDER` environment variable tells all of the various cluster management scripts which variant to use.
 
+The `NUM_MINIONS`environment variable controls the number of nodes that are instantiated 
+
 NOTE: This will take a few minutes, so be patience! Vagrant will provision each machine in the cluster with all the necessary components to run Kubernetes.
 
 It shows the output as:
@@ -651,7 +672,7 @@ Individual resources (service, replication controller, or pod) can be deleted by
 
 [source, text]
 ----
-kubectl delete -l se,po context=docker-k8s-lab
+kubectl delete all -l context=docker-k8s-lab
 ----
 
 ### Stop Kubernetes Cluster

instructor/dockerfiles/lab-httpd-server/Dockerfile

@@ -4,7 +4,6 @@ MAINTAINER Rafael Benevides <benevides@redhat.com>
 
 #Install wget and Apache HTTPD
 RUN dnf -y update && dnf -y install httpd && dnf clean all
-ADD index.html  /var/www/html/
 
 RUN mkdir -p /var/www/html/downloads
 
@@ -78,6 +77,8 @@ RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_x86_64.rpm -o
 #Add other files to downloads
 ADD downloads/lab-settings.xml /var/www/html/downloads/
 
+ADD index.html  /var/www/html/
+
 EXPOSE 80
 
 # Simple startup script to avoid some issues observed with container restart