Add attendees instructions on intructor's http server

rafabene · rafabene · commit 1be6e67a1526 · 2015-05-12T16:37:34.000-04:00
diff --git a/instructor/lab-httpd-server/Dockerfile b/instructor/lab-httpd-server/Dockerfile
@@ -2,17 +2,16 @@ FROM fedora:21
 
 MAINTAINER Rafael Benevides <benevides@redhat.com>
 
+#Install wget and Apache HTTPD
+RUN yum -y update && yum clean all
+RUN yum -y install httpd wget && yum clean all
+ADD index.html  /var/www/html/
+
 RUN mkdir -p /var/www/html/downloads
 
 #Change Workdir to apache dir
 WORKDIR /var/www/html/downloads
 
-#Install wget and Apache HTTPD
-RUN yum -y update && yum clean all
-RUN yum -y install httpd && yum clean all
-RUN echo "Apache" >> /var/www/html/index.html
-RUN yum install -y wget
-
 #Get Boot2docker 1.5
 RUN wget https://github.com/boot2docker/boot2docker/releases/download/v1.6.1/boot2docker.iso
 
diff --git a/instructor/readme.adoc b/instructor/readme.adoc
@@ -15,6 +15,11 @@ Instructor needs:
 . Have https://www.virtualbox.org/[Oracle Virtualbox] installed and the install folder added to your PATH environment variable.
 . Have the https://github.com/arun-gupta/docker-java/ git repository checked out.
 . Have https://msysgit.github.io/ installed on windows
+. Have http://asciidoctor.org/ installed
+
+#Install asciidoctor
+
+gem install asciidoctor
 
 ## Install Docker Client
 
@@ -99,6 +104,15 @@ Instructors should run a local registry to make all images locally available to
 docker run -d --name="docker-registry" -p 5000:5000 -v /registry:/tmp/registry-dev registry:2.0
 ----
 
+##Convert the Attendees instructions to HTML.
+
+This instructions will be placed inside the Lab HTTPD Server during the image build
+
+[source, text]
+----
+asciidoctor ../attendees/readme.adoc -o lab-httpd-server/index.html
+----
+
 ## Build the Lab HTTPD Server image
 
 Make sure to change to the cloned repository/instructor first.
@@ -119,7 +133,7 @@ docker run -d --name="lab-httpd-server" -p 8082:80 lab-httpd-server
 
 If you run into errors on Windows (eg, no such file or exec format error, check the line ending in the run-apache.sh).
 
-Check if the server is running: http://localhost:8082/downloads/
+Check if the server is running: http://localhost:8082/
 
 NOTE: Make sure to check your firewall settings. Attendees should be able to access this machine with your local IP.
 
