Merge pull request #181 from nupplaphil/feat/update_php

Update PHP version
2024-05-24 14:04:57 +02:00 · 2022-01-05 14:47:11 +01:00 · 2022-01-05 14:47:11 +01:00 · d50ef2ad93
parent 2a414acfcb a562de0ba4
commit d50ef2ad93
12 changed files with 66 additions and 55 deletions
--- a/2021.09/apache/Dockerfile
+++ b/2021.09/apache/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/2021.09/fpm-alpine/Dockerfile
+++ b/2021.09/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine
+FROM php:7.4-fpm-alpine

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
        cyrus-sasl-dev \
        libjpeg-turbo-dev \
        freetype-dev \
+        libwebp-dev \
        librsvg \
        pcre-dev \
        libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
+        exif \
        gd \
        zip \
        opcache \
--- a/2021.09/fpm/Dockerfile
+++ b/2021.09/fpm/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
+FROM php:7.4-fpm-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/2021.12-dev/apache/Dockerfile
+++ b/2021.12-dev/apache/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/2021.12-dev/fpm-alpine/Dockerfile
+++ b/2021.12-dev/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine
+FROM php:7.4-fpm-alpine

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
        cyrus-sasl-dev \
        libjpeg-turbo-dev \
        freetype-dev \
+        libwebp-dev \
        librsvg \
        pcre-dev \
        libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
+        exif \
        gd \
        zip \
        opcache \
--- a/2021.12-dev/fpm/Dockerfile
+++ b/2021.12-dev/fpm/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
+FROM php:7.4-fpm-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/2021.12-rc/apache/Dockerfile
+++ b/2021.12-rc/apache/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/2021.12-rc/fpm-alpine/Dockerfile
+++ b/2021.12-rc/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine
+FROM php:7.4-fpm-alpine

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -54,6 +54,7 @@ RUN set -ex; \
        cyrus-sasl-dev \
        libjpeg-turbo-dev \
        freetype-dev \
+        libwebp-dev \
        librsvg \
        pcre-dev \
        libzip-dev \
@ -62,14 +63,14 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
+        exif \
        gd \
        zip \
        opcache \
--- a/2021.12-rc/fpm/Dockerfile
+++ b/2021.12-rc/fpm/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
+FROM php:7.4-fpm-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,6 +65,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -73,10 +74,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -84,6 +84,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -53,6 +53,7 @@ RUN set -ex; \
        cyrus-sasl-dev \
        libjpeg-turbo-dev \
        freetype-dev \
+        libwebp-dev \
        librsvg \
        pcre-dev \
        libzip-dev \
@ -61,14 +62,14 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
+        exif \
        gd \
        zip \
        opcache \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%-buster
+FROM php:%%PHP_VERSION%%-%%VARIANT%%-bullseye

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -64,6 +64,7 @@ RUN set -ex; \
        libmemcached-dev \
        libgraphicsmagick1-dev \
        libfreetype6-dev \
+        libwebp-dev \
        librsvg2-2 \
        libzip-dev \
        libldap2-dev \
@ -72,10 +73,9 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
@ -83,6 +83,7 @@ RUN set -ex; \
    docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
+        exif \
        zip \
        opcache \
        ctype \
--- a/update.sh
+++ b/update.sh
@ -2,7 +2,7 @@
 set -eo pipefail

 declare -A php_version=(
-  [default]='7.3'
+  [default]='7.4'
 )

 declare -A cmd=(