From 52b11d2035d80daabc6e5eb7975ed36900afc953 Mon Sep 17 00:00:00 2001
From: Man Math <man@web-essentials.asia>
Date: Fri, 1 Jul 2016 16:29:36 +0700
Subject: [PATCH] [TASK] Set default to 80 instead of 8080

---
 Configuration/Web/nginx_vhost.conf | 2 +-
 README.md                          | 2 +-
 bin/dockerflow                     | 7 +++----
 docker-compose.yml                 | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Configuration/Web/nginx_vhost.conf b/Configuration/Web/nginx_vhost.conf
index 7c59ecf..d7f1956 100644
--- a/Configuration/Web/nginx_vhost.conf
+++ b/Configuration/Web/nginx_vhost.conf
@@ -1,5 +1,5 @@
 server {
-	listen      8080;
+	listen      80;
 	# TODO: Maybe we can just use $hostname instead
 	server_name DOCKER_FLOW_SERVERNAME;
 
diff --git a/README.md b/README.md
index 9a05017..3ef74ef 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,7 @@ WEB_CONTAINER_IP    project-url
 WEB_CONTAINER_IP    test.project-url
 ```
 
-You need to define the default test suite url in your `behat.yml` to use `http://test.project-url:8080` and then you can
+You need to define the default test suite url in your `behat.yml` to use `http://test.project-url` and then you can
 run the behat tests without having to connect external selenium server
 
 ```
diff --git a/bin/dockerflow b/bin/dockerflow
index 5aa716a..3d75853 100755
--- a/bin/dockerflow
+++ b/bin/dockerflow
@@ -22,7 +22,7 @@ wrapped_command="docker-compose -p \"${projectname}\" -f ${package_dir}/docker-c
 DOCKER_FLOW_SERVERNAME=${projectname}
 
 # Default port for dockerflow
-DOCKER_FLOW_PORT=8080
+DOCKER_FLOW_PORT=80
 
 # Use Development context if Flow Context is not set
 DOCKER_FLOW_CONTEXT=${FLOW_CONTEXT:=Development}
@@ -58,9 +58,8 @@ if [ "$action" = "up" ]; then
 	${wrapped_command} run --rm app /entrypoint.sh
 
 	# Print information about running app container
-	used_port=`${wrapped_command} port web ${DOCKER_FLOW_PORT} | sed 's/^.*\:\([0-9]*\).*$/\1/g'`
 	echo "####"
-	echo "### Done! Your app is running here  : ${projectname}:${used_port}"
-	echo "### Testing context is running here : test.${projectname}:${used_port}"
+	echo "### Done! Your app is running here  : ${projectname}"
+	echo "### Testing context is running here : test.${projectname}"
 	echo "####"
 fi
diff --git a/docker-compose.yml b/docker-compose.yml
index 1306b2f..2e01fd3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ db:
 web:
   image: nginx:1.7
   ports:
-    - "8080:8080"
+    - "80:80"
   volumes:
     - ./Configuration/Web/nginx.conf:/etc/nginx/nginx.conf:ro
     - ./Configuration/Web/nginx_vhost_merged.conf:/etc/nginx/conf.d/default.conf:ro