Fix arun-gupta#52 arun-gupta#53 arun-gupta#54 - Fix for Failed to build instructor 'http-server' container and use JBDS 9.1 Beta 2

rafabene · rafabene · commit 43e3463706f3 · 2015-06-09T12:18:46.000-04:00
diff --git a/chapters/docker-setup.adoc b/chapters/docker-setup.adoc
@@ -125,8 +125,12 @@ Download your binary from http://dockerlab:8082/downloads/
 
 [source, text]
 ----
-# MacOS / Linux (other distros)
-curl -L  http://dockerlab:8082/`uname -s`/x86_64/docker-latest > /usr/local/bin/docker
+# MacOS
+curl -L  http://dockerlab:8082/downloads/docker-latest-mac > /usr/local/bin/docker
+chmod +x /usr/local/bin/docker
+
+# Linux (other distros)
+curl -L  http://dockerlab:8082/downloads/docker-latest-linux > /usr/local/bin/docker
 chmod +x /usr/local/bin/docker
 
 #Windows
@@ -180,16 +184,16 @@ docker-machine ip lab
 . Download WildFly 8.2 from http://dockerlab:8082/downloads/wildfly-8.2.0.Final.zip
 . Install it by clicking on the archive.
 
-#### JBoss Developer Studio 9
+#### JBoss Developer Studio 9 - Beta 2
 
 To install JBoss Developer Studio stand-alone, complete the following steps:
 
-. Download http://dockerlab:8082/downloads/jboss-devstudio-8.1.0.GA-jar_universal.jar
+. Download http://localhost:8082/downloads/jboss-devstudio-9.0.0.Beta2-v20150609-1026-B3346-installer-standalone.jar
 . Start the installer as:
 +
 [source, text]
 ----
-java -jar jboss-devstudio-8.1.0.GA-jar_universal.jar
+java -jar jboss-devstudio-9.0.0.Beta2-v20150609-1026-B3346-installer-standalone.jar
 ----
 +
 Follow the on-screen instructions to complete the installation process.
diff --git a/chapters/ticket-monster.adoc b/chapters/ticket-monster.adoc
@@ -60,7 +60,7 @@ Start Postgres database as:
 docker run --name db -d -p 5432:5432 -e POSTGRES_USER=ticketmonster -e POSTGRES_PASSWORD=ticketmonster-docker dockerlab:5000/postgres
 ----
 
-This command starts a container named ``db'' from the image in your instructor's registry `<dockerlab>:5000/postgres`. As this will not be present locally, it needs to be downloaded first. But you'll have a very quick connection to the instructor registry and this shouldn't take long.
+This command starts a container named ``db'' from the image in your instructor's registry `dockerlab:5000/postgres`. As this will not be present locally, it needs to be downloaded first. But you'll have a very quick connection to the instructor registry and this shouldn't take long.
 
 The two `-e` options define environment variables which are read by the db at startup and allow us to access the database with this user and password.
 
@@ -92,7 +92,7 @@ Start WildFly server as:
 
 [source, text]
 ----
-docker run -d --name wildfly -p 8080:8080 --link db:db -v /Users/youruser/tmp/deployments:/opt/jboss/wildfly/standalone/deployments/:rw <dockerlab>:5000/wildfly
+docker run -d --name wildfly -p 8080:8080 --link db:db -v /Users/youruser/tmp/deployments:/opt/jboss/wildfly/standalone/deployments/:rw dockerlab:5000/wildfly
 ----
 
 Make sure to replace `/Users/youruser/tmp/deployments` to a directory on your local machine. Also, make sure this directory already exists.
@@ -184,7 +184,7 @@ The Command Line Interface (CLI) is a tool for connecting to WildFly instances t
 
 Lets use the CLI to deploy Ticket Monster to WildFly running in the container.
 
-. CLI needs to be locally installed and comes as part of WildFly. Download WildFly 8.2 from http://<dockerlab>:8082/downloads/wildfly-8.2.0.Final.zip. Unzip into a folder of your choice (e.g. `/Users/arungupta/tools/`). This will create `wildfly-8.2.0.Final` directory here. This folder is named $WIDLFY_HOME from here on. Make sure to add the `/Users/arungupta/tools/wildfly-8.2.0.Final/bin` to your $PATH.
+. CLI needs to be locally installed and comes as part of WildFly. Download WildFly 8.2 from http://dockerlab:8082/downloads/wildfly-8.2.0.Final.zip. Unzip into a folder of your choice (e.g. `/Users/arungupta/tools/`). This will create `wildfly-8.2.0.Final` directory here. This folder is named $WIDLFY_HOME from here on. Make sure to add the `/Users/arungupta/tools/wildfly-8.2.0.Final/bin` to your $PATH.
 +
 [source, text]
 ----
@@ -243,7 +243,7 @@ A standalone WildFly process, process can be configured to listen for remote man
 +
 [source, text]
 ----
-docker run -d --name wildflymngm -p 8080:8080 -p 9990:9990 --link db:db <dockerlab>:5000/wildfly-management
+docker run -d --name wildflymngm -p 8080:8080 -p 9990:9990 --link db:db dockerlab:5000/wildfly-management
 ----
 +
 There is no mapped volume in this case but an additional port exposed. The WildFly image that is used makes it easier for you to play around with the deployment via the management API. It has a tweaked start script which changes the management interface according to the behavior described in the first sentence.
diff --git a/instructor/dockerfiles/lab-httpd-server/Dockerfile b/instructor/dockerfiles/lab-httpd-server/Dockerfile
@@ -12,7 +12,10 @@ RUN mkdir -p /var/www/html/downloads
 WORKDIR /var/www/html/downloads
 
 #Place JBDS inside the image
-ADD downloads/jboss-devstudio-8.1.0.GA-installer-standalone.jar /var/www/html/downloads/
+ADD downloads/jboss-devstudio-9.0.0.Beta2-v20150609-1026-B3346-installer-standalone.jar /var/www/html/downloads/
+
+#Setup permission for JBDS
+chmod 644 /var/www/html/downloads/jboss-devstudio-9.0.0.Beta2-v20150609-1026-B3346-installer-standalone.jar
 
 #Get WildFly 8.2
 RUN wget http://download.jboss.org/wildfly/8.2.0.Final/wildfly-8.2.0.Final.zip
@@ -42,7 +45,10 @@ RUN wget https://github.com/docker/machine/releases/download/v0.3.0-rc1/docker-m
 RUN wget https://github.com/docker/machine/releases/download/v0.3.0-rc1/docker-machine_linux-amd64
 
 #Get Docker Client Mac OS
-RUN wget curl https://get.docker.com/builds/Darwin/x86_64/docker-latest
+RUN curl -L https://get.docker.com/builds/Darwin/x86_64/docker-latest -o docker-latest-mac
+
+#Get Docker Client Linux
+RUN curl -L https://get.docker.com/builds/Linux/x86_64/docker-latest -o docker-latest-linux
 
 #Get Docker Client Windows
 RUN wget http://test.docker.com.s3.amazonaws.com/builds/Windows/x86_64/docker-1.6.0.exe
@@ -52,16 +58,16 @@ RUN wget http://apache.mirrors.ionfish.org/maven/maven-3/3.3.3/binaries/apache-m
 RUN wget http://apache.mirrors.ionfish.org/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
 
 #Get Vagrant MacOS
-RUN wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.dmg
+RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.dmg -o vagrant_1.7.2.dmg
 
 #Get Vagrant Windows
-RUN wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.msi
+RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.msi -o vagrant_1.7.2.msi
 
 #Get Vagrant Debian 64-bit
-RUN wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
+RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb -o vagrant_1.7.2_x86_64.deb
 
 #Get Vagrant Linux 64-bit
-RUN wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm
+RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm -o vagrant_1.7.2_x86_64.rpm
 
 #Get Kubernetes
 RUN wget https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.18.1/kubernetes.tar.gz
diff --git a/instructor/readme.adoc b/instructor/readme.adoc
@@ -200,7 +200,7 @@ This will download the Nexus image on Docker host and populate it with the Nexus
 
 ## Start the Instructor Environment
 
-Download link:http://www.jboss.org/download-manager/file/jboss-devstudio-8.1.0.GA-standalone_jar.jar[JBoss Developer Studio 8.10.GA - 567 MB] and place it inside `dockerfiles/lab-httpd-server/downloads` folder.
+Download link:https://devstudio.redhat.com/9.0/snapshots/builds/devstudio.product_master/2015-06-09_06-24-34-B3346/installer/[JBoss Developer Studio 9.0 - Beta2 - 482MB] and place it inside `dockerfiles/lab-httpd-server/downloads` folder.
 
 Use the following compose command to startup the complete environment at once.
 
