From 42746dc18c0795e006f9e9625b6e5340544bded6 Mon Sep 17 00:00:00 2001
From: William Pain <pain.william@gmail.com>
Date: Tue, 7 Nov 2017 18:20:27 +0100
Subject: [PATCH] Add -p flag for preserve environment and override HOME.

---
 12.0/apache/docker-entrypoint.sh | 4 +++-
 12.0/fpm/docker-entrypoint.sh    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/12.0/apache/docker-entrypoint.sh b/12.0/apache/docker-entrypoint.sh
index 9298bb47..3c905af9 100755
--- a/12.0/apache/docker-entrypoint.sh
+++ b/12.0/apache/docker-entrypoint.sh
@@ -13,7 +13,9 @@ function directory_empty() {
 
 function run_as() {
   if [[ $EUID -eq 0 ]]; then
-    su - www-data -s /bin/bash -c "$1"
+    HOME="/var/www"
+    su - www-data -p -s /bin/bash -c "$1"
+    HOME="/root"
   else
     bash -c "$1"
   fi
diff --git a/12.0/fpm/docker-entrypoint.sh b/12.0/fpm/docker-entrypoint.sh
index 9298bb47..3c905af9 100755
--- a/12.0/fpm/docker-entrypoint.sh
+++ b/12.0/fpm/docker-entrypoint.sh
@@ -13,7 +13,9 @@ function directory_empty() {
 
 function run_as() {
   if [[ $EUID -eq 0 ]]; then
-    su - www-data -s /bin/bash -c "$1"
+    HOME="/var/www"
+    su - www-data -p -s /bin/bash -c "$1"
+    HOME="/root"
   else
     bash -c "$1"
   fi