From d5bdcd6f8ca2f71db83d556b90e5c2802fa01ede Mon Sep 17 00:00:00 2001
From: Christian Daguerre <christian@worldia.com>
Date: Fri, 9 Nov 2018 10:15:03 +0100
Subject: [PATCH] fix hardcoded ini dir

---
 5.6/alpine3.8/cli/docker-php-ext-enable     | 2 +-
 5.6/alpine3.8/fpm/docker-php-ext-enable     | 2 +-
 5.6/alpine3.8/zts/docker-php-ext-enable     | 2 +-
 5.6/jessie/apache/docker-php-ext-enable     | 2 +-
 5.6/jessie/cli/docker-php-ext-enable        | 2 +-
 5.6/jessie/fpm/docker-php-ext-enable        | 2 +-
 5.6/jessie/zts/docker-php-ext-enable        | 2 +-
 5.6/stretch/apache/docker-php-ext-enable    | 2 +-
 5.6/stretch/cli/docker-php-ext-enable       | 2 +-
 5.6/stretch/fpm/docker-php-ext-enable       | 2 +-
 5.6/stretch/zts/docker-php-ext-enable       | 2 +-
 7.0/alpine3.7/cli/docker-php-ext-enable     | 2 +-
 7.0/alpine3.7/fpm/docker-php-ext-enable     | 2 +-
 7.0/alpine3.7/zts/docker-php-ext-enable     | 2 +-
 7.0/jessie/apache/docker-php-ext-enable     | 2 +-
 7.0/jessie/cli/docker-php-ext-enable        | 2 +-
 7.0/jessie/fpm/docker-php-ext-enable        | 2 +-
 7.0/jessie/zts/docker-php-ext-enable        | 2 +-
 7.0/stretch/apache/docker-php-ext-enable    | 2 +-
 7.0/stretch/cli/docker-php-ext-enable       | 2 +-
 7.0/stretch/fpm/docker-php-ext-enable       | 2 +-
 7.0/stretch/zts/docker-php-ext-enable       | 2 +-
 7.1/alpine3.8/cli/docker-php-ext-enable     | 2 +-
 7.1/alpine3.8/fpm/docker-php-ext-enable     | 2 +-
 7.1/alpine3.8/zts/docker-php-ext-enable     | 2 +-
 7.1/jessie/apache/docker-php-ext-enable     | 2 +-
 7.1/jessie/cli/docker-php-ext-enable        | 2 +-
 7.1/jessie/fpm/docker-php-ext-enable        | 2 +-
 7.1/jessie/zts/docker-php-ext-enable        | 2 +-
 7.1/stretch/apache/docker-php-ext-enable    | 2 +-
 7.1/stretch/cli/docker-php-ext-enable       | 2 +-
 7.1/stretch/fpm/docker-php-ext-enable       | 2 +-
 7.1/stretch/zts/docker-php-ext-enable       | 2 +-
 7.2/alpine3.8/cli/docker-php-ext-enable     | 2 +-
 7.2/alpine3.8/fpm/docker-php-ext-enable     | 2 +-
 7.2/alpine3.8/zts/docker-php-ext-enable     | 2 +-
 7.2/stretch/apache/docker-php-ext-enable    | 2 +-
 7.2/stretch/cli/docker-php-ext-enable       | 2 +-
 7.2/stretch/fpm/docker-php-ext-enable       | 2 +-
 7.2/stretch/zts/docker-php-ext-enable       | 2 +-
 7.3-rc/alpine3.8/cli/docker-php-ext-enable  | 2 +-
 7.3-rc/alpine3.8/fpm/docker-php-ext-enable  | 2 +-
 7.3-rc/alpine3.8/zts/docker-php-ext-enable  | 2 +-
 7.3-rc/stretch/apache/docker-php-ext-enable | 2 +-
 7.3-rc/stretch/cli/docker-php-ext-enable    | 2 +-
 7.3-rc/stretch/fpm/docker-php-ext-enable    | 2 +-
 7.3-rc/stretch/zts/docker-php-ext-enable    | 2 +-
 docker-php-ext-enable                       | 2 +-
 48 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/5.6/alpine3.8/cli/docker-php-ext-enable b/5.6/alpine3.8/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/alpine3.8/cli/docker-php-ext-enable
+++ b/5.6/alpine3.8/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/alpine3.8/fpm/docker-php-ext-enable b/5.6/alpine3.8/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/alpine3.8/fpm/docker-php-ext-enable
+++ b/5.6/alpine3.8/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/alpine3.8/zts/docker-php-ext-enable b/5.6/alpine3.8/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/alpine3.8/zts/docker-php-ext-enable
+++ b/5.6/alpine3.8/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/jessie/apache/docker-php-ext-enable b/5.6/jessie/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/jessie/apache/docker-php-ext-enable
+++ b/5.6/jessie/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/jessie/cli/docker-php-ext-enable b/5.6/jessie/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/jessie/cli/docker-php-ext-enable
+++ b/5.6/jessie/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/jessie/fpm/docker-php-ext-enable b/5.6/jessie/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/jessie/fpm/docker-php-ext-enable
+++ b/5.6/jessie/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/jessie/zts/docker-php-ext-enable b/5.6/jessie/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/jessie/zts/docker-php-ext-enable
+++ b/5.6/jessie/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/stretch/apache/docker-php-ext-enable b/5.6/stretch/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/stretch/apache/docker-php-ext-enable
+++ b/5.6/stretch/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/stretch/cli/docker-php-ext-enable b/5.6/stretch/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/stretch/cli/docker-php-ext-enable
+++ b/5.6/stretch/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/stretch/fpm/docker-php-ext-enable b/5.6/stretch/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/stretch/fpm/docker-php-ext-enable
+++ b/5.6/stretch/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/5.6/stretch/zts/docker-php-ext-enable b/5.6/stretch/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/5.6/stretch/zts/docker-php-ext-enable
+++ b/5.6/stretch/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/alpine3.7/cli/docker-php-ext-enable b/7.0/alpine3.7/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/alpine3.7/cli/docker-php-ext-enable
+++ b/7.0/alpine3.7/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/alpine3.7/fpm/docker-php-ext-enable b/7.0/alpine3.7/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/alpine3.7/fpm/docker-php-ext-enable
+++ b/7.0/alpine3.7/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/alpine3.7/zts/docker-php-ext-enable b/7.0/alpine3.7/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/alpine3.7/zts/docker-php-ext-enable
+++ b/7.0/alpine3.7/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/jessie/apache/docker-php-ext-enable b/7.0/jessie/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/jessie/apache/docker-php-ext-enable
+++ b/7.0/jessie/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/jessie/cli/docker-php-ext-enable b/7.0/jessie/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/jessie/cli/docker-php-ext-enable
+++ b/7.0/jessie/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/jessie/fpm/docker-php-ext-enable b/7.0/jessie/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/jessie/fpm/docker-php-ext-enable
+++ b/7.0/jessie/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/jessie/zts/docker-php-ext-enable b/7.0/jessie/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/jessie/zts/docker-php-ext-enable
+++ b/7.0/jessie/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/stretch/apache/docker-php-ext-enable b/7.0/stretch/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/stretch/apache/docker-php-ext-enable
+++ b/7.0/stretch/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/stretch/cli/docker-php-ext-enable b/7.0/stretch/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/stretch/cli/docker-php-ext-enable
+++ b/7.0/stretch/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/stretch/fpm/docker-php-ext-enable b/7.0/stretch/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/stretch/fpm/docker-php-ext-enable
+++ b/7.0/stretch/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.0/stretch/zts/docker-php-ext-enable b/7.0/stretch/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.0/stretch/zts/docker-php-ext-enable
+++ b/7.0/stretch/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/alpine3.8/cli/docker-php-ext-enable b/7.1/alpine3.8/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/alpine3.8/cli/docker-php-ext-enable
+++ b/7.1/alpine3.8/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/alpine3.8/fpm/docker-php-ext-enable b/7.1/alpine3.8/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.1/alpine3.8/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/alpine3.8/zts/docker-php-ext-enable b/7.1/alpine3.8/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/alpine3.8/zts/docker-php-ext-enable
+++ b/7.1/alpine3.8/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/jessie/apache/docker-php-ext-enable b/7.1/jessie/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/jessie/apache/docker-php-ext-enable
+++ b/7.1/jessie/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/jessie/cli/docker-php-ext-enable b/7.1/jessie/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/jessie/cli/docker-php-ext-enable
+++ b/7.1/jessie/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/jessie/fpm/docker-php-ext-enable b/7.1/jessie/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/jessie/fpm/docker-php-ext-enable
+++ b/7.1/jessie/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/jessie/zts/docker-php-ext-enable b/7.1/jessie/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/jessie/zts/docker-php-ext-enable
+++ b/7.1/jessie/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/stretch/apache/docker-php-ext-enable b/7.1/stretch/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/stretch/apache/docker-php-ext-enable
+++ b/7.1/stretch/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/stretch/cli/docker-php-ext-enable b/7.1/stretch/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/stretch/cli/docker-php-ext-enable
+++ b/7.1/stretch/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/stretch/fpm/docker-php-ext-enable b/7.1/stretch/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/stretch/fpm/docker-php-ext-enable
+++ b/7.1/stretch/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.1/stretch/zts/docker-php-ext-enable b/7.1/stretch/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.1/stretch/zts/docker-php-ext-enable
+++ b/7.1/stretch/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/alpine3.8/cli/docker-php-ext-enable b/7.2/alpine3.8/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/alpine3.8/cli/docker-php-ext-enable
+++ b/7.2/alpine3.8/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/alpine3.8/fpm/docker-php-ext-enable b/7.2/alpine3.8/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.2/alpine3.8/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/alpine3.8/zts/docker-php-ext-enable b/7.2/alpine3.8/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/alpine3.8/zts/docker-php-ext-enable
+++ b/7.2/alpine3.8/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/stretch/apache/docker-php-ext-enable b/7.2/stretch/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/stretch/apache/docker-php-ext-enable
+++ b/7.2/stretch/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/stretch/cli/docker-php-ext-enable b/7.2/stretch/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/stretch/cli/docker-php-ext-enable
+++ b/7.2/stretch/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/stretch/fpm/docker-php-ext-enable b/7.2/stretch/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/stretch/fpm/docker-php-ext-enable
+++ b/7.2/stretch/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.2/stretch/zts/docker-php-ext-enable b/7.2/stretch/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.2/stretch/zts/docker-php-ext-enable
+++ b/7.2/stretch/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/alpine3.8/cli/docker-php-ext-enable b/7.3-rc/alpine3.8/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/alpine3.8/cli/docker-php-ext-enable
+++ b/7.3-rc/alpine3.8/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/alpine3.8/fpm/docker-php-ext-enable b/7.3-rc/alpine3.8/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/alpine3.8/fpm/docker-php-ext-enable
+++ b/7.3-rc/alpine3.8/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/alpine3.8/zts/docker-php-ext-enable b/7.3-rc/alpine3.8/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/alpine3.8/zts/docker-php-ext-enable
+++ b/7.3-rc/alpine3.8/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/stretch/apache/docker-php-ext-enable b/7.3-rc/stretch/apache/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/stretch/apache/docker-php-ext-enable
+++ b/7.3-rc/stretch/apache/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/stretch/cli/docker-php-ext-enable b/7.3-rc/stretch/cli/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/stretch/cli/docker-php-ext-enable
+++ b/7.3-rc/stretch/cli/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/stretch/fpm/docker-php-ext-enable b/7.3-rc/stretch/fpm/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/stretch/fpm/docker-php-ext-enable
+++ b/7.3-rc/stretch/fpm/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/7.3-rc/stretch/zts/docker-php-ext-enable b/7.3-rc/stretch/zts/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/7.3-rc/stretch/zts/docker-php-ext-enable
+++ b/7.3-rc/stretch/zts/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi
diff --git a/docker-php-ext-enable b/docker-php-ext-enable
index a2aa88ec..2b067f03 100755
--- a/docker-php-ext-enable
+++ b/docker-php-ext-enable
@@ -103,7 +103,7 @@ for module in $modules; do
 		continue
 	fi
 
-	ini="/usr/local/etc/php/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
+	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
 	if ! grep -q "$line" "$ini" 2>/dev/null; then
 		echo "$line" >> "$ini"
 	fi