Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed phpdbg, added pcov dependency as part of the build #148

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ RUN apt update \
php7.1-intl \
php7.1-json \
php7.1-mbstring \
php7.1-pcov \
php7.1-phar \
php7.1-phpdbg \
php7.1-readline \
php7.1-sockets \
php7.1-xml \
Expand All @@ -134,8 +134,8 @@ RUN apt update \
php7.2-intl \
php7.2-json \
php7.2-mbstring \
php7.2-pcov \
php7.2-phar \
php7.2-phpdbg \
php7.2-readline \
php7.2-sockets \
php7.2-xml \
Expand All @@ -150,8 +150,8 @@ RUN apt update \
php7.3-intl \
php7.3-json \
php7.3-mbstring \
php7.3-pcov \
php7.3-phar \
php7.3-phpdbg \
php7.3-readline \
php7.3-sockets \
php7.3-xml \
Expand All @@ -166,8 +166,8 @@ RUN apt update \
php7.4-intl \
php7.4-json \
php7.4-mbstring \
php7.4-pcov \
php7.4-phar \
php7.4-phpdbg \
php7.4-readline \
php7.4-sockets \
php7.4-xml \
Expand All @@ -181,8 +181,8 @@ RUN apt update \
php8.0-fileinfo \
php8.0-intl \
php8.0-mbstring \
php8.0-pcov \
php8.0-phar \
php8.0-phpdbg \
php8.0-readline \
php8.0-sockets \
php8.0-xml \
Expand All @@ -196,8 +196,8 @@ RUN apt update \
php8.1-fileinfo \
php8.1-intl \
php8.1-mbstring \
php8.1-pcov \
php8.1-phar \
php8.1-phpdbg \
php8.1-readline \
php8.1-sockets \
php8.1-xml \
Expand All @@ -211,8 +211,8 @@ RUN apt update \
php8.2-fileinfo \
php8.2-intl \
php8.2-mbstring \
php8.2-pcov \
php8.2-phar \
php8.2-phpdbg \
php8.2-readline \
php8.2-sockets \
php8.2-xml \
Expand Down
2 changes: 0 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ echo "Marking PHP ${PHP} as configured default"
update-alternatives --quiet --set php "/usr/bin/php${PHP}"
update-alternatives --quiet --set php-config "/usr/bin/php-config${PHP}"
update-alternatives --quiet --set phpize "/usr/bin/phpize${PHP}"
update-alternatives --quiet --set phpdbg "/usr/bin/phpdbg${PHP}"

# Marks the working directory as safe for the current user prior to checkout
git config --global --add safe.directory '*'
Expand Down Expand Up @@ -188,7 +187,6 @@ fi
if [[ "${INI}" != "" ]];then
echo "Installing php.ini settings"
echo "$INI" > "/etc/php/${PHP}/cli/conf.d/99-settings.ini"
echo "$INI" > "/etc/php/${PHP}/phpdbg/conf.d/99-settings.ini"
Ocramius marked this conversation as resolved.
Show resolved Hide resolved
fi

echo "PHP version: $(php --version)"
Expand Down
8 changes: 3 additions & 5 deletions scripts/php_ini_dev_settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ SUBSTITUTIONS+=('s/zend.assertions ?= ?(-1|1)/zend.assertions = 1/')
SUBSTITUTIONS+=('s/opcache.huge_code_pages ?= ?(0|1)/opcache.huge_code_pages = 0/')

for PHP_VERSION in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2;do
for PHP_SAPI in cli phpdbg; do
INI_FILE="/etc/php/${PHP_VERSION}/${PHP_SAPI}/php.ini"
for SUBSTITUTION in "${SUBSTITUTIONS[@]}";do
sed --in-place -E -e "${SUBSTITUTION}" "${INI_FILE}"
done
INI_FILE="/etc/php/${PHP_VERSION}/cli/php.ini"
for SUBSTITUTION in "${SUBSTITUTIONS[@]}";do
sed --in-place -E -e "${SUBSTITUTION}" "${INI_FILE}"
done
done