From 5600f2d86fef80effc2671426251f4a4d7945c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vachon?= <fredvac@gmail.com>
Date: Thu, 19 Feb 2015 11:17:32 -0500
Subject: [PATCH] Docker's apache now listens on port 8080

---
 Makefile                   |  4 ++--
 container/000-default.conf |  2 +-
 container/Dockerfile       |  3 ++-
 container/ports.conf       | 15 +++++++++++++++
 readme.rst                 |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 container/ports.conf

diff --git a/Makefile b/Makefile
index b43d32c..b36bcf6 100644
--- a/Makefile
+++ b/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
diff --git a/container/000-default.conf b/container/000-default.conf
index 8ce2b07..9078bc7 100644
--- a/container/000-default.conf
+++ b/container/000-default.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     ProxyPreserveHost On
 
     # Servers to proxy the connection, or;
diff --git a/container/Dockerfile b/container/Dockerfile
index ab2d4dd..be3b066 100644
--- a/container/Dockerfile
+++ b/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"]
diff --git a/container/ports.conf b/container/ports.conf
new file mode 100644
index 0000000..03d5dd2
--- /dev/null
+++ b/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
diff --git a/readme.rst b/readme.rst
index 75864be..b1b40b7 100644
--- a/readme.rst
+++ b/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