danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2025-01-21 20:41:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #740 from cdaguerre/cdaguerre-patch-1

Browse Source 
Fix hardcoded ini dir
This commit is contained in:
yosifkit 2018-11-09 13:07:48 -08:00 committed by GitHub
commit 189782763e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
5.6/alpine3.8/cli/docker-php-ext-enable
View File

@ -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

2
5.6/alpine3.8/fpm/docker-php-ext-enable
View File

@ -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

2
5.6/alpine3.8/zts/docker-php-ext-enable
View File

@ -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

2
5.6/jessie/apache/docker-php-ext-enable
View File

@ -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

2
5.6/jessie/cli/docker-php-ext-enable
View File

@ -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

2
5.6/jessie/fpm/docker-php-ext-enable
View File

@ -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

2
5.6/jessie/zts/docker-php-ext-enable
View File

@ -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

2
5.6/stretch/apache/docker-php-ext-enable
View File

@ -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

2
5.6/stretch/cli/docker-php-ext-enable
View File

@ -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

2
5.6/stretch/fpm/docker-php-ext-enable
View File

@ -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

2
5.6/stretch/zts/docker-php-ext-enable
View File

@ -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

2
7.0/alpine3.7/cli/docker-php-ext-enable
View File

@ -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

2
7.0/alpine3.7/fpm/docker-php-ext-enable
View File

@ -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

2
7.0/alpine3.7/zts/docker-php-ext-enable
View File

@ -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

2
7.0/jessie/apache/docker-php-ext-enable
View File

@ -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

2
7.0/jessie/cli/docker-php-ext-enable
View File

@ -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

2
7.0/jessie/fpm/docker-php-ext-enable
View File

@ -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

2
7.0/jessie/zts/docker-php-ext-enable
View File

@ -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

2
7.0/stretch/apache/docker-php-ext-enable
View File

@ -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

2
7.0/stretch/cli/docker-php-ext-enable
View File

@ -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

2
7.0/stretch/fpm/docker-php-ext-enable
View File

@ -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

2
7.0/stretch/zts/docker-php-ext-enable
View File

@ -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

2
7.1/alpine3.8/cli/docker-php-ext-enable
View File

@ -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

2
7.1/alpine3.8/fpm/docker-php-ext-enable
View File

@ -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

2
7.1/alpine3.8/zts/docker-php-ext-enable
View File

@ -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

2
7.1/jessie/apache/docker-php-ext-enable
View File

@ -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

2
7.1/jessie/cli/docker-php-ext-enable
View File

@ -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

2
7.1/jessie/fpm/docker-php-ext-enable
View File

@ -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

2
7.1/jessie/zts/docker-php-ext-enable
View File

@ -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

2
7.1/stretch/apache/docker-php-ext-enable
View File

@ -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

2
7.1/stretch/cli/docker-php-ext-enable
View File

@ -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

2
7.1/stretch/fpm/docker-php-ext-enable
View File

@ -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

2
7.1/stretch/zts/docker-php-ext-enable
View File

@ -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

2
7.2/alpine3.8/cli/docker-php-ext-enable
View File

@ -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

2
7.2/alpine3.8/fpm/docker-php-ext-enable
View File

@ -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

2
7.2/alpine3.8/zts/docker-php-ext-enable
View File

@ -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

2
7.2/stretch/apache/docker-php-ext-enable
View File

@ -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

2
7.2/stretch/cli/docker-php-ext-enable
View File

@ -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

2
7.2/stretch/fpm/docker-php-ext-enable
View File

@ -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

2
7.2/stretch/zts/docker-php-ext-enable
View File

@ -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

2
7.3-rc/alpine3.8/cli/docker-php-ext-enable
View File

@ -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

2
7.3-rc/alpine3.8/fpm/docker-php-ext-enable
View File

@ -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

2
7.3-rc/alpine3.8/zts/docker-php-ext-enable
View File

@ -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

2
7.3-rc/stretch/apache/docker-php-ext-enable
View File

@ -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

2
7.3-rc/stretch/cli/docker-php-ext-enable
View File

@ -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

2
7.3-rc/stretch/fpm/docker-php-ext-enable
View File

@ -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

2
7.3-rc/stretch/zts/docker-php-ext-enable
View File

@ -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

2
docker-php-ext-enable
View File

@ -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