🐛 fix build

Kanti · Kanti · commit 0e8ace59b5a8 · 2025-12-01T16:10:22.000+01:00
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
diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile b/docker/php-apache-dev/8.5-alpine/Dockerfile
@@ -24,7 +24,10 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && apk del -f --purge \
         autoconf \
         linux-headers \
diff --git a/docker/php-apache-dev/8.5/Dockerfile b/docker/php-apache-dev/8.5/Dockerfile
@@ -22,7 +22,10 @@ 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 \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
diff --git a/docker/php-dev/8.5-alpine/Dockerfile b/docker/php-dev/8.5-alpine/Dockerfile
@@ -16,7 +16,10 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && apk del -f --purge \
         autoconf \
         linux-headers \
diff --git a/docker/php-dev/8.5/Dockerfile b/docker/php-dev/8.5/Dockerfile
@@ -14,7 +14,10 @@ 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 \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2
@@ -7,5 +7,5 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.2") }} \
+    {{ php.officialDevelopmentAlpine(version="8.3") }} \
     {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2
@@ -7,5 +7,5 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.2") }} \
+    {{ php.officialDevelopmentAlpine(version="8.4") }} \
     {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile b/docker/php-nginx-dev/8.5-alpine/Dockerfile
@@ -24,7 +24,10 @@ RUN set -x \
         make \
         autoconf \
         g++ \
-    && pecl install xdebug \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && apk del -f --purge \
         autoconf \
         linux-headers \
diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2
@@ -7,5 +7,5 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.2") }} \
+    {{ php.officialDevelopmentAlpine(version="8.5") }} \
     {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.5/Dockerfile b/docker/php-nginx-dev/8.5/Dockerfile
@@ -22,7 +22,10 @@ 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 \
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile
@@ -172,7 +172,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 5.x
     && pecl install apcu-4.0.11 \
diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile
@@ -172,7 +172,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile
@@ -177,7 +177,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \
diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile
@@ -172,7 +172,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile
@@ -177,7 +177,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile
@@ -171,7 +171,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile
@@ -177,7 +177,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile
@@ -171,7 +171,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile
@@ -182,7 +182,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile
@@ -145,6 +145,7 @@ RUN set -x \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
         bcmath \
+        amqp \
         bz2 \
         calendar \
         exif \
@@ -170,7 +171,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     && pecl install apcu \
diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile
@@ -181,7 +181,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile
@@ -174,7 +174,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile
@@ -178,7 +178,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile
@@ -173,7 +173,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile
@@ -178,7 +178,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile
@@ -173,7 +173,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile
@@ -178,7 +178,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile
@@ -173,7 +173,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile
@@ -176,7 +176,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile
@@ -171,7 +171,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
     APPLICATION_PATH=/app \
     APPLICATION_UID=1000 \
     APPLICATION_GID=1000
-ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
+ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" 
 ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 ENV COMPOSER_VERSION="2"
 
@@ -158,7 +158,6 @@ RUN set -x \
         gmp \
         ffi \
         imagick \
-        amqp \
         intl \
         gettext \
         ldap \
@@ -176,8 +175,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
-        opcache \
     # Install extensions for PHP 7.x
     # Memcached for 7.3 can currently only be built from master
     && MEMCACHED="`mktemp -d`" \
diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile
@@ -38,7 +38,7 @@ RUN set -x \
     && apt-update \
     && /usr/local/bin/generate-dockerimage-info \
     # Enable non-free
-    && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \
+    && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \    
     && apt-update \
     # System update
     && /usr/local/bin/apt-upgrade \
@@ -146,7 +146,6 @@ RUN set -x \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && docker-php-ext-install \
         bcmath \
-        amqp \
         imagick \
         ffi \
         bz2 \
@@ -171,8 +170,6 @@ RUN set -x \
         xsl \
         zip \
         gd \
-        gettext \
-        opcache \
     && pecl install memcached \
     && pecl install apcu \
     && pecl install excimer \
diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -83,8 +83,10 @@
 {%- endif %}
     && docker-php-ext-install \
         bcmath \
-{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
+{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
         amqp \
+{%- endif %}
+{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
         imagick \
         ffi \
 {%- endif %}
@@ -125,8 +127,9 @@
         xsl \
         zip \
         gd \
-        gettext \
+{%- if version != '8.5' %}
         opcache \
+{%- endif %}
 {%- if version|int == 5 %}
     # Install extensions for PHP 5.x
     && pecl install apcu-4.0.11 \
@@ -294,6 +297,8 @@
 {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
         ffi \
         imagick \
+{%- endif %}
+{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
         amqp \
 {%- endif %}
         intl \
@@ -325,8 +330,9 @@
         xsl \
         zip \
         gd \
-        gettext \
+{%- if version != '8.5' %}
         opcache \
+{%- endif %}
     # Install extensions for PHP 7.x
     {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
     # Memcached for 7.3 can currently only be built from master
@@ -428,7 +434,12 @@
     && apt-install tideways-php tideways-daemon \
     {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
-    {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
+    {%- elif version == '8.5' %}
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
+    {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
     && pecl install xdebug \
     {%- elif version == '7.0' or version == '7.1' %}
     && pecl install xdebug-2.8.1 \
@@ -454,6 +465,11 @@
     && pecl install xdebug-2.5.5 \
     {%- elif version == '7.0' or version == '7.1' %}
     && pecl install xdebug-2.8.1 \
+    {%- elif version == '8.5' %}
+    && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
+    && chmod +x /usr/local/bin/pie \
+    && pie install xdebug/xdebug:^3.5.0@alpha \
+    && rm -f /usr/local/bin/pie \
     {%- elif version == '7.4' %}
     && pecl install xdebug-3.1.6 \
     {%- else %}
