Docker's apache now listens on port 8080

Makefile

@@ -9,10 +9,10 @@ rebuild:
 	sudo docker build --no-cache -t adg-fe container
 
 interactive:
-	sudo docker run -p 80:80 -p 8000:8000 -v ${PWD}:/opt/adagios-frontend -i -t --name adg-fe adg-fe bash
+	sudo docker run -p 8080:8080 -v ${PWD}:/opt/adagios-frontend -i -t --name adg-fe adg-fe bash
 
 daemon:
-	sudo docker run -p 80:80 -p 8000:8000 -v ${PWD}:/opt/adagios-frontend -d -t --name adg-fe adg-fe
+	sudo docker run -p 8080:8080 -v ${PWD}:/opt/adagios-frontend -d -t --name adg-fe adg-fe
 
 kill:
 	sudo docker kill adg-fe

container/000-default.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     ProxyPreserveHost On
 
     # Servers to proxy the connection, or;

container/Dockerfile

@@ -18,10 +18,11 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Configure Apache2 for reverse-proxying
 ADD 000-default.conf etc/apache2/sites-enabled/000-default.conf
+ADD ports.conf etc/apache2/ports.conf
 RUN a2enmod proxy
 RUN a2enmod proxy_http
 
 # Expose appropriate ports
-EXPOSE 80 8000
+EXPOSE 8080
 
 CMD ["/usr/bin/supervisord"]

container/ports.conf

@@ -0,0 +1,15 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
+# /etc/apache2/sites-enabled/000-default.conf
+
+Listen 8080
+
+<IfModule ssl_module>
+	Listen 443
+</IfModule>
+
+<IfModule mod_gnutls.c>
+	Listen 443
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

readme.rst

@@ -39,7 +39,7 @@ you already have docker installed) :
 
     make build
     make daemon
-    curl http://localhost/app
+    curl http://localhost:8080/app
 
 
 Coding style