Fix arun-gupta#10 - Add JBDS to Instructor http server

rafabene · rafabene · commit 526523112df0 · 2015-05-25T14:19:22.000-04:00
diff --git a/instructor/dockerfiles/lab-httpd-server/Dockerfile b/instructor/dockerfiles/lab-httpd-server/Dockerfile
@@ -12,9 +12,11 @@ RUN mkdir -p /var/www/html/downloads
 #Change Workdir to apache dir
 WORKDIR /var/www/html/downloads
 
-#Get Boot2docker 1.5
-RUN wget https://github.com/boot2docker/boot2docker/releases/download/v1.6.1/boot2docker.iso
+#Place JBDS inside the image
+ADD downloads/jboss-devstudio-8.1.0.GA-installer-standalone.jar /var/www/html/downloads/
 
+#Get Boot2docker 1.6.1
+RUN wget https://github.com/boot2docker/boot2docker/releases/download/v1.6.1/boot2docker.iso
 
 #Get VirtualBox for MAC
 RUN wget http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26-98988-OSX.dmg
@@ -42,7 +44,7 @@ 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
 
 #Add other files to downloads
-ADD lab-settings.xml /var/www/html/downloads/
+ADD downloads/lab-settings.xml /var/www/html/downloads/
 
 
 EXPOSE 80
diff --git a/instructor/dockerfiles/lab-httpd-server/downloads/.gitignore b/instructor/dockerfiles/lab-httpd-server/downloads/.gitignore
@@ -0,0 +1 @@
+jboss-devstudio-8.1.0.GA-installer-standalone.jar
diff --git a/instructor/dockerfiles/lab-httpd-server/downloads/lab-settings.xml b/instructor/dockerfiles/lab-httpd-server/downloads/lab-settings.xml
diff --git a/instructor/readme.adoc b/instructor/readme.adoc
@@ -116,6 +116,8 @@ docker run --name="nexusdata" -v $(pwd):/backup sonatype/nexus:oss bash -c "tar
 ----
 
 ## Start the Instructor environment
+Download link:https://www.jboss.org/download-manager/content/origin/files/sha256/0e/0e3e78a641196d21742730f23a6e1c9aa04e0596c16349e74dbd4ea2d1109d40/jboss-devstudio-8.1.0.GA-installer-standalone.jar[JBDS 8.10.GA - 567 MB] and place it inside *dockerfiles/lab-httpd-server/downloads* folder.
+
 Use the following compose command to startup the complete environment at once.
 _Note: This command should take some time to execute_
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+jboss-devstudio-8.1.0.GA-installer-standalone.jar`