Skip to content

Commit 7417566

Browse files
committed
Adjust "docker-php-ext-enable" to use "grep -Fx"
Also, test both versions (with `.so` and without). This helps avoid false positives due to lines like `extension=apc` matching `extension=apcu`.
1 parent c70a901 commit 7417566

33 files changed

+33
-33
lines changed

7.3/alpine3.12/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/alpine3.12/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/alpine3.12/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/alpine3.13/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/alpine3.13/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/alpine3.13/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/buster/apache/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/buster/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/buster/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/buster/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/stretch/apache/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/stretch/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/stretch/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.3/stretch/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.12/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.12/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.12/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.13/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.13/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/alpine3.13/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/buster/apache/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/buster/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/buster/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

7.4/buster/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/alpine3.12/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/alpine3.12/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/alpine3.13/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/alpine3.13/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/apache/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/cli/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/fpm/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/zts/docker-php-ext-enable

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-php-ext-enable

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ for module in $modules; do
111111
ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
112112
;;
113113
esac
114-
if ! grep -q "$line" "$ini" 2>/dev/null; then
114+
if ! grep -qFx -e "$line" -e "$line.so" "$ini" 2>/dev/null; then
115115
echo "$line" >> "$ini"
116116
fi
117117
done

0 commit comments

Comments
 (0)