Skip to content

Commit 161636d

Browse files
authored
Merge pull request #17 from moveis-simonetti/update/php7dot4
update/php7dot4
2 parents f0a37db + a7db2b3 commit 161636d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ ENV XDEBUG_AUTOSTART=false
1616
ENV XDEBUG_CONNECT_BACK=true
1717
ENV XDEBUG_ENABLED=false
1818
ENV XDEBUG_IDEKEY="docker"
19-
ENV XDEBUG_VERSION="-2.8.1"
19+
ENV XDEBUG_VERSION=""
20+
ENV XDEBUG_REMOTE_PORT=9000
2021
ENV PHP_EXTENSION_WDDX=1
2122
ENV PHP_OPENSSL=1
2223

@@ -38,7 +39,7 @@ RUN echo "---> Adding Redis" && \
3839
docker-php-ext-enable redis
3940

4041
RUN echo "---> Adding xDebug" && \
41-
pecl install xdebug${XDEBUG_VERSION}
42+
pecl install "xdebug${XDEBUG_VERSION}"
4243

4344
RUN echo "---> Adding Zip" && \
4445
pecl install zip && \

apache-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [[ ${XDEBUG_ENABLED} == true ]]; then
55
echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
66
echo "xdebug.idekey=${XDEBUG_IDEKEY}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
77
echo "xdebug.remote_enable=1" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
8-
echo "xdebug.remote_port=9000" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
8+
echo "xdebug.remote_port=${XDEBUG_REMOTE_PORT}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
99

1010
[[ ${XDEBUG_AUTOSTART} == true ]] && {
1111
echo "xdebug.remote_autostart=on" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini

0 commit comments

Comments
 (0)