Skip to content

Commit

Permalink
fix: xdebug version, alpine dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@htuscher
htuscher committed Dec 12, 2022
1 parent 3ffed4a commit 7b18342
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/php-apache-dev/7.4-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN set -x \
make \
autoconf \
g++ \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& apk del -f --purge \
autoconf \
g++ \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-apache-dev/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN set -x \
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
&& apt-install tideways-php tideways-daemon \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& docker-php-ext-enable xdebug \
# Enable php development services
&& docker-service enable syslog \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-dev/7.4-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN set -x \
make \
autoconf \
g++ \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& apk del -f --purge \
autoconf \
g++ \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-dev/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN set -x \
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
&& apt-install tideways-php tideways-daemon \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& docker-php-ext-enable xdebug \
# Enable php development services
&& docker-service enable syslog \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-nginx-dev/7.4-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN set -x \
make \
autoconf \
g++ \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& apk del -f --purge \
autoconf \
g++ \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-nginx-dev/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN set -x \
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
&& apt-install tideways-php tideways-daemon \
&& pecl install xdebug \
&& pecl install xdebug-3.1.6 \
&& docker-php-ext-enable xdebug \
# Enable php development services
&& docker-service enable syslog \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/7.1-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -195,6 +196,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/7.2-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -199,6 +200,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/7.3-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -199,6 +200,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/7.4-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -202,6 +203,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.0-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -202,6 +203,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.1-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -201,6 +202,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.2-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -x \
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -201,6 +202,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down
6 changes: 6 additions & 0 deletions template/Dockerfile/images/php.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
libmemcached \
yaml \
# Build dependencies
linux-headers \
autoconf \
g++ \
make \
Expand Down Expand Up @@ -343,6 +344,7 @@
# Uninstall dev and header packages
&& apk del -f --purge \
autoconf \
linux-headers \
g++ \
make \
libtool \
Expand Down Expand Up @@ -387,6 +389,8 @@
&& pecl install xdebug \
{%- elif version == '7.0' or version == '7.1' %}
&& pecl install xdebug-2.8.1 \
{%- elif version == '7.4' %}
&& pecl install xdebug-3.1.6 \
{%- else %}
&& pecl install xdebug \
{%- endif %}
Expand All @@ -406,6 +410,8 @@
&& pecl install xdebug-2.5.5 \
{%- elif version == '7.0' or version == '7.1' %}
&& pecl install xdebug-2.8.1 \
{%- elif version == '7.4' %}
&& pecl install xdebug-3.1.6 \
{%- else %}
&& pecl install xdebug \
{%- endif %}
Expand Down

0 comments on commit 7b18342

Please sign in to comment.