From e8e05dd5108b81f69870ee7b5b572c1288255f20 Mon Sep 17 00:00:00 2001
From: Derek Bonner <derek@derekbonner.com>
Date: Mon, 8 Feb 2016 14:23:08 -0800
Subject: [PATCH 1/2] Changes Apache ports to be outside of restrictive port
 range to allow apache-foreground to be run as www-data and not root.

---
 5.5/apache/Dockerfile     | 3 ++-
 5.5/apache/apache2.conf   | 6 +++---
 5.6/apache/apache2.conf   | 6 +++---
 7.0/apache/Dockerfile     | 3 ++-
 7.0/apache/apache2.conf   | 6 +++---
 apache-Dockerfile-block-2 | 3 ++-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index 673380dc65..3a47620a99 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -79,6 +79,7 @@ COPY docker-php-ext-* /usr/local/bin/
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]
 ##</autogenerated>##
diff --git a/5.5/apache/apache2.conf b/5.5/apache/apache2.conf
index ab5b2648a6..8742f2a591 100644
--- a/5.5/apache/apache2.conf
+++ b/5.5/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8080
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/5.6/apache/apache2.conf b/5.6/apache/apache2.conf
index ab5b2648a6..f6296c4633 100644
--- a/5.6/apache/apache2.conf
+++ b/5.6/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8090
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index cff8f9455a..7f1de51d63 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -79,6 +79,7 @@ COPY docker-php-ext-* /usr/local/bin/
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]
 ##</autogenerated>##
diff --git a/7.0/apache/apache2.conf b/7.0/apache/apache2.conf
index ab5b2648a6..8742f2a591 100644
--- a/7.0/apache/apache2.conf
+++ b/7.0/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8080
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/apache-Dockerfile-block-2 b/apache-Dockerfile-block-2
index 613378a197..7fda63417c 100644
--- a/apache-Dockerfile-block-2
+++ b/apache-Dockerfile-block-2
@@ -1,5 +1,6 @@
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]

From 82e572cc3478d8f17ba4269e5408e56c490c8c06 Mon Sep 17 00:00:00 2001
From: Derek Bonner <derek@derekbonner.com>
Date: Mon, 8 Feb 2016 15:07:31 -0800
Subject: [PATCH 2/2] Misnumbered port

---
 5.6/apache/apache2.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/5.6/apache/apache2.conf b/5.6/apache/apache2.conf
index f6296c4633..8742f2a591 100644
--- a/5.6/apache/apache2.conf
+++ b/5.6/apache/apache2.conf
@@ -16,7 +16,7 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 8090
+Listen 8080
 <IfModule ssl_module>
 	Listen 8443
 </IfModule>