diff --git a/dockerfiles/php-lol/Dockerfile.8.1 b/dockerfiles/php-lol/Dockerfile.8.1 index 8edd347..39cbaf4 100644 --- a/dockerfiles/php-lol/Dockerfile.8.1 +++ b/dockerfiles/php-lol/Dockerfile.8.1 @@ -1,7 +1,7 @@ # # Foundation # -FROM php:8.1.34-fpm-bookworm AS foundation +FROM php:8.1.34-fpm-trixie@sha256:a3118db1911fdd3b3ac66605122ddc859286688ced86fc860fec6d19cc2d6c55 AS foundation ENV \ APP_DIR=/usr/src/app \ @@ -17,15 +17,13 @@ ENV BUILD_DEPENDENCIES \ cmake \ curl \ libbz2-dev \ - libc-client-dev \ libgeoip-dev \ libgmp-dev \ libicu-dev \ libjpeg-dev \ - libkrb5-dev \ liblz4-dev \ libmemcached-dev \ - libpcre3-dev \ + libpcre2-dev \ libpng-dev \ libpq-dev \ librabbitmq-dev \ @@ -48,12 +46,12 @@ RUN set -eux \ geoip-database \ git \ imagemagick \ - libaio1 \ + libaio1t64 \ libfontconfig \ libjpeg-turbo-progs \ libmagickcore-dev \ libmagickwand-dev \ - libodbc1 \ + libodbc2 \ libpq5 \ librabbitmq4 \ libtool \ @@ -84,8 +82,6 @@ RUN set -eux \ && make \ && make install \ && popd \ - && PHP_OPENSSL=yes docker-php-ext-configure \ - imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -93,7 +89,6 @@ RUN set -eux \ ftp \ gd \ iconv \ - imap \ intl \ opcache \ pcntl \ diff --git a/dockerfiles/php-lol/Dockerfile.8.2 b/dockerfiles/php-lol/Dockerfile.8.2 index 96a7aff..fa2677e 100644 --- a/dockerfiles/php-lol/Dockerfile.8.2 +++ b/dockerfiles/php-lol/Dockerfile.8.2 @@ -1,7 +1,7 @@ # # Foundation # -FROM php:8.2.30-fpm-bookworm AS foundation +FROM php:8.2.30-fpm-trixie@sha256:2974f4c56916f527e9426b16d0aac4ee0454a86d8b2f481663b18d5edf07187f AS foundation ENV \ APP_DIR=/usr/src/app \ @@ -17,15 +17,13 @@ ENV BUILD_DEPENDENCIES \ cmake \ curl \ libbz2-dev \ - libc-client-dev \ libgeoip-dev \ libgmp-dev \ libicu-dev \ libjpeg-dev \ - libkrb5-dev \ liblz4-dev \ libmemcached-dev \ - libpcre3-dev \ + libpcre2-dev \ libpng-dev \ libpq-dev \ librabbitmq-dev \ @@ -48,12 +46,12 @@ RUN set -eux \ geoip-database \ git \ imagemagick \ - libaio1 \ + libaio1t64 \ libfontconfig \ libjpeg-turbo-progs \ libmagickcore-dev \ libmagickwand-dev \ - libodbc1 \ + libodbc2 \ libpq5 \ librabbitmq4 \ libtool \ @@ -84,8 +82,6 @@ RUN set -eux \ && make \ && make install \ && popd \ - && PHP_OPENSSL=yes docker-php-ext-configure \ - imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -93,7 +89,6 @@ RUN set -eux \ ftp \ gd \ iconv \ - imap \ intl \ opcache \ pcntl \ diff --git a/dockerfiles/php-lol/Dockerfile.8.3 b/dockerfiles/php-lol/Dockerfile.8.3 index 56b5e07..a52b5f0 100644 --- a/dockerfiles/php-lol/Dockerfile.8.3 +++ b/dockerfiles/php-lol/Dockerfile.8.3 @@ -1,7 +1,7 @@ # # Foundation # -FROM php:8.3.30-fpm-bookworm AS foundation +FROM php:8.3.30-fpm-trixie@sha256:6754d4da4545f912c55671e4dd2eb79ea4d1ed677b93e1c5415fe46d1a46b23d AS foundation ENV \ APP_DIR=/usr/src/app \ @@ -17,15 +17,13 @@ ENV BUILD_DEPENDENCIES \ cmake \ curl \ libbz2-dev \ - libc-client-dev \ libgeoip-dev \ libgmp-dev \ libicu-dev \ libjpeg-dev \ - libkrb5-dev \ liblz4-dev \ libmemcached-dev \ - libpcre3-dev \ + libpcre2-dev \ libpng-dev \ libpq-dev \ librabbitmq-dev \ @@ -48,12 +46,12 @@ RUN set -eux \ geoip-database \ git \ imagemagick \ - libaio1 \ + libaio1t64 \ libfontconfig \ libjpeg-turbo-progs \ libmagickcore-dev \ libmagickwand-dev \ - libodbc1 \ + libodbc2 \ libpq5 \ librabbitmq4 \ libtool \ @@ -84,8 +82,6 @@ RUN set -eux \ && make \ && make install \ && popd \ - && PHP_OPENSSL=yes docker-php-ext-configure \ - imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -93,7 +89,6 @@ RUN set -eux \ ftp \ gd \ iconv \ - imap \ intl \ opcache \ pcntl \ diff --git a/dockerfiles/php-lol/Dockerfile.8.4 b/dockerfiles/php-lol/Dockerfile.8.4 index b951728..426d081 100644 --- a/dockerfiles/php-lol/Dockerfile.8.4 +++ b/dockerfiles/php-lol/Dockerfile.8.4 @@ -1,7 +1,7 @@ # # Foundation # -FROM php:8.4.17-fpm-bookworm AS foundation +FROM php:8.4.17-fpm-trixie@sha256:b3059c7682a331bc96281ffba2693fd0dcafb8684e6bde24fa77aa9c3e7a1d5d AS foundation ENV \ APP_DIR=/usr/src/app \ @@ -17,15 +17,13 @@ ENV BUILD_DEPENDENCIES \ cmake \ curl \ libbz2-dev \ - libc-client-dev \ libgeoip-dev \ libgmp-dev \ libicu-dev \ libjpeg-dev \ - libkrb5-dev \ liblz4-dev \ libmemcached-dev \ - libpcre3-dev \ + libpcre2-dev \ libpng-dev \ libpq-dev \ librabbitmq-dev \ @@ -48,12 +46,12 @@ RUN set -eux \ geoip-database \ git \ imagemagick \ - libaio1 \ + libaio1t64 \ libfontconfig \ libjpeg-turbo-progs \ libmagickcore-dev \ libmagickwand-dev \ - libodbc1 \ + libodbc2 \ libpq5 \ librabbitmq4 \ libtool \ @@ -69,8 +67,6 @@ RUN set -eux \ && pickle install amqp@2.2.0 \ && pickle install --no-interaction apcu@5.1.28 \ && pickle install igbinary@3.2.16 \ - && echo "--with-imap-ssl --with-kerberos" > imap_options \ - && PHP_OPENSSL=yes pickle install --no-interaction --with-configure-options="imap_options" imap@1.0.3 \ && echo "--enable-memcached-igbinary --enable-memcached-msgpack" > memcached_options \ && echo "--enable-redis-igbinary --enable-redis-msgpack" > redis_options \ && pickle install msgpack@3.0.0 \ diff --git a/tests/php-lol.yaml b/tests/php-lol.yaml index b4062cc..0f31300 100644 --- a/tests/php-lol.yaml +++ b/tests/php-lol.yaml @@ -205,12 +205,6 @@ commandTests: exitCode: 0 expectedOutput: ['igbinary'] - - name: 'imap extension is installed' - command: 'sh' - args: ['-c', 'php -m | grep -i imap'] - exitCode: 0 - expectedOutput: ['imap'] - - name: 'imagick extension is installed' command: 'sh' args: ['-c', 'php -m | grep -i imagick']