Skip to content

Commit fe03422

Browse files
committed
🐛 fix build
remove opcache for php 8.5 as it is included. use pie to install alpha3 of xdebug 3.5.0 (as only it is compatible with php 8.5) do not install amqp as it is not compatbile with 8.5 at all
1 parent e2490c5 commit fe03422

File tree

32 files changed

+55
-41
lines changed

32 files changed

+55
-41
lines changed

docker/php-apache-dev/8.5-alpine/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ RUN set -x \
2424
make \
2525
autoconf \
2626
g++ \
27-
&& pecl install xdebug \
27+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
28+
&& chmod +x /usr/local/bin/pie \
29+
&& pie install xdebug/xdebug:^3.5.0@alpha \
30+
&& rm -f /usr/local/bin/pie \
2831
&& apk del -f --purge \
2932
autoconf \
3033
linux-headers \

docker/php-apache-dev/8.5/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ RUN set -x \
2222
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2323
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2424
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
25+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
26+
&& chmod +x /usr/local/bin/pie \
27+
&& pie install xdebug/xdebug:^3.5.0@alpha \
28+
&& rm -f /usr/local/bin/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

docker/php-dev/8.5-alpine/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ RUN set -x \
1616
make \
1717
autoconf \
1818
g++ \
19-
&& pecl install xdebug \
19+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
20+
&& chmod +x /usr/local/bin/pie \
21+
&& pie install xdebug/xdebug:^3.5.0@alpha \
22+
&& rm -f /usr/local/bin/pie \
2023
&& apk del -f --purge \
2124
autoconf \
2225
linux-headers \

docker/php-dev/8.5/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ RUN set -x \
1414
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
1515
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
1616
&& apt-install tideways-php tideways-daemon \
17-
&& pecl install xdebug \
17+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
18+
&& chmod +x /usr/local/bin/pie \
19+
&& pie install xdebug/xdebug:^3.5.0@alpha \
20+
&& rm -f /usr/local/bin/pie \
1821
&& docker-php-ext-enable xdebug \
1922
# Enable php development services
2023
&& docker-service enable syslog \

docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
{{ docker.copy('conf/', '/opt/docker/') }}
88

99
RUN set -x \
10-
{{ php.officialDevelopmentAlpine(version="8.2") }} \
10+
{{ php.officialDevelopmentAlpine(version="8.3") }} \
1111
{{ provision.runBootstrap() }}

docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
{{ docker.copy('conf/', '/opt/docker/') }}
88

99
RUN set -x \
10-
{{ php.officialDevelopmentAlpine(version="8.2") }} \
10+
{{ php.officialDevelopmentAlpine(version="8.4") }} \
1111
{{ provision.runBootstrap() }}

docker/php-nginx-dev/8.5-alpine/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ RUN set -x \
2424
make \
2525
autoconf \
2626
g++ \
27-
&& pecl install xdebug \
27+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
28+
&& chmod +x /usr/local/bin/pie \
29+
&& pie install xdebug/xdebug:^3.5.0@alpha \
30+
&& rm -f /usr/local/bin/pie \
2831
&& apk del -f --purge \
2932
autoconf \
3033
linux-headers \

docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
{{ docker.copy('conf/', '/opt/docker/') }}
88

99
RUN set -x \
10-
{{ php.officialDevelopmentAlpine(version="8.2") }} \
10+
{{ php.officialDevelopmentAlpine(version="8.5") }} \
1111
{{ provision.runBootstrap() }}

docker/php-nginx-dev/8.5/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ RUN set -x \
2222
&& echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
2323
&& wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
2424
&& apt-install tideways-php tideways-daemon \
25-
&& pecl install xdebug \
25+
&& wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
26+
&& chmod +x /usr/local/bin/pie \
27+
&& pie install xdebug/xdebug:^3.5.0@alpha \
28+
&& rm -f /usr/local/bin/pie \
2629
&& docker-php-ext-enable xdebug \
2730
# Enable php development services
2831
&& docker-service enable syslog \

docker/php-official/5.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ RUN set -x \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \
148+
amqp \
148149
bz2 \
149150
calendar \
150151
exif \
@@ -172,7 +173,6 @@ RUN set -x \
172173
xsl \
173174
zip \
174175
gd \
175-
gettext \
176176
opcache \
177177
# Install extensions for PHP 5.x
178178
&& pecl install apcu-4.0.11 \

0 commit comments

Comments
 (0)