From 0e4f51c82d1ace6c36b58ce06345fe30cddbe795 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 29 Mar 2022 01:36:39 +0200 Subject: [PATCH] Simplify install of vips --- CHANGELOG.md | 2 + Dockerfiles/mods/Dockerfile-5.2 | 1 + Dockerfiles/mods/Dockerfile-5.3 | 1 + Dockerfiles/mods/Dockerfile-5.4 | 1 + Dockerfiles/mods/Dockerfile-5.5 | 1 + Dockerfiles/mods/Dockerfile-5.6 | 1 + Dockerfiles/mods/Dockerfile-7.0 | 51 ++------- Dockerfiles/mods/Dockerfile-7.1 | 53 ++-------- Dockerfiles/mods/Dockerfile-7.2 | 53 ++-------- Dockerfiles/mods/Dockerfile-7.3 | 51 ++------- Dockerfiles/mods/Dockerfile-7.4 | 59 ++--------- Dockerfiles/mods/Dockerfile-8.0 | 36 ++++--- Dockerfiles/mods/Dockerfile-8.1 | 36 ++++--- Dockerfiles/mods/Dockerfile-8.2 | 1 + README.md | 4 +- build/ansible/group_vars/all/mods.yml | 147 +++++--------------------- 16 files changed, 115 insertions(+), 383 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e517382..e98845e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ #### Added - Added arm64 support +- Added `vips` module for PHP 8.0 +- Added `vips` module for PHP 8.1 #### Changed - Separated nightly jobs diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index f42f07a..2217975 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -602,6 +602,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant1c2a \ + libevent-2.0-5 \ libfbclient2 \ libfreetype6 \ libicu52 \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index f4069b0..debd030 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -712,6 +712,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant1c2a \ + libevent-2.0-5 \ libfbclient2 \ libfreetype6 \ libicu52 \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 4d36547..0a77813 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -723,6 +723,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant1c2a \ + libevent-2.0-5 \ libfbclient2 \ libfreetype6 \ libicu52 \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index b4d2766..9bb8ef8 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -762,6 +762,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant1c2a \ + libevent-2.0-5 \ libfbclient2 \ libfreetype6 \ libicu52 \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index c539a2d..131d642 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -781,6 +781,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant1c2a \ + libevent-2.0-5 \ libfbclient2 \ libfreetype6 \ libicu57 \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 83d4a43..6a1e032 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -9,33 +9,23 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ - fftw-dev \ firebird-dev \ freetds-dev \ ghostscript \ - gobject-introspection \ - gtk-doc-tools \ libaio-dev \ libbz2-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ - libexif-dev \ - libexpat1-dev \ libfbclient2 \ - libfftw3-dev \ libfreetype6-dev \ - libgif-dev \ - libglib2.0-dev \ libgmp-dev \ libib-util \ libicu-dev \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - libmagick++-dev \ - libmagickcore-6.q16-dev \ libmagickwand-dev \ libmariadbclient-dev \ libmcrypt-dev \ @@ -43,23 +33,20 @@ RUN set -eux \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ - libpoppler-glib-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ librecode-dev \ - librsvg2-dev \ libsasl2-dev \ libsnmp-dev \ libssh2-1-dev \ libssl-dev \ libtidy-dev \ - libtool \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ - libwebpdemux2 \ - libwebpmux2 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -347,10 +334,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension - # Default: Pecl command - && pecl install memcached \ + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -737,15 +724,6 @@ RUN set -eux \ # -------------------- Installing PHP Extension: vips -------------------- RUN set -eux \ - # Generic pre-command - && git clone https://github.com/libvips/libvips /tmp/libvips \ -&& cd /tmp/libvips \ -&& ./autogen.sh \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ -&& cd /tmp \ -&& rm -rf /tmp/libvips \ - \ # Installation: Generic # Type: PECL extension # Default: Pecl command @@ -884,47 +862,32 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ - fftw2 \ ghostscript \ - gir1.2-poppler-0.18 \ - imagemagick-6.q16 \ libaio1 \ libaspell15 \ libc-client2007e \ libenchant1c2a \ - libexif12 \ - libexpat1 \ + libevent-2.0-5 \ libfbclient2 \ - libfftw3-3 \ libfreetype6 \ - libgif7 \ - libglib2.0-0 \ libicu57 \ libjpeg62-turbo \ - libmagick++-6.q16-7 \ - libmagick++-6.q16hdri-7 \ - libmagickcore-6.q16-3 \ - libmagickcore-6.q16-3-extra \ libmagickwand-6.q16-3 \ - libmagickwand-6.q16hdri-3 \ libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ libpng16-16 \ - libpoppler-glib8 \ libpq5 \ librabbitmq4 \ librdkafka1 \ librecode0 \ - librsvg2-2 \ libssh2-1 \ libsybdb5 \ libtidy5 \ + libvips42 \ libvpx4 \ libwebp6 \ - libwebpdemux2 \ - libwebpmux2 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 8fab135..750a31d 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -9,34 +9,23 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ - fftw-dev \ firebird-dev \ freetds-dev \ ghostscript \ - gobject-introspection \ - gtk-doc-tools \ libaio-dev \ libbz2-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ - libexif-dev \ - libexpat1-dev \ libfbclient2 \ - libfftw3-dev \ libfreetype6-dev \ - libgif-dev \ - libglib2.0-dev \ libgmp-dev \ libib-util \ libicu-dev \ - libimagequant-dev \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - libmagick++-dev \ - libmagickcore-6.q16-dev \ libmagickwand-dev \ libmariadb-dev \ libmcrypt-dev \ @@ -44,23 +33,20 @@ RUN set -eux \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ - libpoppler-glib-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ librecode-dev \ - librsvg2-dev \ libsasl2-dev \ libsnmp-dev \ libssh2-1-dev \ libssl-dev \ libtidy-dev \ - libtool \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ - libwebpdemux2 \ - libwebpmux3 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -348,10 +334,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension - # Default: Pecl command - && pecl install memcached \ + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -746,15 +732,6 @@ RUN set -eux \ # -------------------- Installing PHP Extension: vips -------------------- RUN set -eux \ - # Generic pre-command - && git clone https://github.com/libvips/libvips /tmp/libvips \ -&& cd /tmp/libvips \ -&& ./autogen.sh \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ -&& cd /tmp \ -&& rm -rf /tmp/libvips \ - \ # Installation: Generic # Type: PECL extension # Default: Pecl command @@ -893,48 +870,32 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ - fftw2 \ ghostscript \ - gir1.2-poppler-0.18 \ - imagemagick-6.q16 \ libaio1 \ libaspell15 \ libc-client2007e \ libenchant1c2a \ - libexif12 \ - libexpat1 \ + libevent-2.1-6 \ libfbclient2 \ - libfftw3-3 \ libfreetype6 \ - libgif7 \ - libglib2.0-0 \ libicu63 \ - libimagequant0 \ libjpeg62-turbo \ - libmagick++-6.q16-8 \ - libmagick++-6.q16hdri-8 \ - libmagickcore-6.q16-6 \ - libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ - libmagickwand-6.q16hdri-6 \ libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ libpng16-16 \ - libpoppler-glib8 \ libpq5 \ librabbitmq4 \ librdkafka1 \ librecode0 \ - librsvg2-2 \ libssh2-1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx5 \ libwebp6 \ - libwebpdemux2 \ - libwebpmux3 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index dd540ac..83eb3d0 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -9,34 +9,23 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ - fftw-dev \ firebird-dev \ freetds-dev \ ghostscript \ - gobject-introspection \ - gtk-doc-tools \ libaio-dev \ libbz2-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ - libexif-dev \ - libexpat1-dev \ libfbclient2 \ - libfftw3-dev \ libfreetype6-dev \ - libgif-dev \ - libglib2.0-dev \ libgmp-dev \ libib-util \ libicu-dev \ - libimagequant-dev \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - libmagick++-dev \ - libmagickcore-6.q16-dev \ libmagickwand-dev \ libmariadb-dev \ libmcrypt-dev \ @@ -44,23 +33,20 @@ RUN set -eux \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ - libpoppler-glib-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ librecode-dev \ - librsvg2-dev \ libsasl2-dev \ libsnmp-dev \ libssh2-1-dev \ libssl-dev \ libtidy-dev \ - libtool \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ - libwebpdemux2 \ - libwebpmux3 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -350,10 +336,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension - # Default: Pecl command - && pecl install memcached \ + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -749,15 +735,6 @@ RUN set -eux \ # -------------------- Installing PHP Extension: vips -------------------- RUN set -eux \ - # Generic pre-command - && git clone https://github.com/libvips/libvips /tmp/libvips \ -&& cd /tmp/libvips \ -&& ./autogen.sh \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ -&& cd /tmp \ -&& rm -rf /tmp/libvips \ - \ # Installation: Generic # Type: PECL extension # Default: Pecl command @@ -896,48 +873,32 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ - fftw2 \ ghostscript \ - gir1.2-poppler-0.18 \ - imagemagick-6.q16 \ libaio1 \ libaspell15 \ libc-client2007e \ libenchant1c2a \ - libexif12 \ - libexpat1 \ + libevent-2.1-6 \ libfbclient2 \ - libfftw3-3 \ libfreetype6 \ - libgif7 \ - libglib2.0-0 \ libicu63 \ - libimagequant0 \ libjpeg62-turbo \ - libmagick++-6.q16-8 \ - libmagick++-6.q16hdri-8 \ - libmagickcore-6.q16-6 \ - libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ - libmagickwand-6.q16hdri-6 \ libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ libpng16-16 \ - libpoppler-glib8 \ libpq5 \ librabbitmq4 \ librdkafka1 \ librecode0 \ - librsvg2-2 \ libssh2-1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx5 \ libwebp6 \ - libwebpdemux2 \ - libwebpmux3 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index fda12c9..d87ff8c 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -9,33 +9,22 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ - fftw-dev \ firebird-dev \ freetds-dev \ ghostscript \ - gobject-introspection \ - gtk-doc-tools \ libaio-dev \ libbz2-dev \ libc-client-dev \ libcurl4-openssl-dev \ libevent-dev \ - libexif-dev \ - libexpat1-dev \ libfbclient2 \ - libfftw3-dev \ libfreetype6-dev \ - libgif-dev \ - libglib2.0-dev \ libgmp-dev \ libib-util \ libicu-dev \ - libimagequant-dev \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - libmagick++-dev \ - libmagickcore-6.q16-dev \ libmagickwand-dev \ libmariadb-dev \ libmcrypt-dev \ @@ -43,23 +32,20 @@ RUN set -eux \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ - libpoppler-glib-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ librecode-dev \ - librsvg2-dev \ libsasl2-dev \ libsnmp-dev \ libssh2-1-dev \ libssl-dev \ libtidy-dev \ - libtool \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ - libwebpdemux2 \ - libwebpmux3 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -342,8 +328,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: PECL extension - # Default: Pecl command - && pecl install memcached \ + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -739,15 +725,6 @@ RUN set -eux \ # -------------------- Installing PHP Extension: vips -------------------- RUN set -eux \ - # Generic pre-command - && git clone https://github.com/libvips/libvips /tmp/libvips \ -&& cd /tmp/libvips \ -&& ./autogen.sh \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ -&& cd /tmp \ -&& rm -rf /tmp/libvips \ - \ # Installation: Generic # Type: PECL extension # Default: Pecl command @@ -886,47 +863,31 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ - fftw2 \ ghostscript \ - gir1.2-poppler-0.18 \ - imagemagick-6.q16 \ libaio1 \ libaspell15 \ libc-client2007e \ - libexif12 \ - libexpat1 \ + libevent-2.1-7 \ libfbclient2 \ - libfftw3-3 \ libfreetype6 \ - libgif7 \ - libglib2.0-0 \ libicu67 \ - libimagequant0 \ libjpeg62-turbo \ - libmagick++-6.q16-8 \ - libmagick++-6.q16hdri-8 \ - libmagickcore-6.q16-6 \ - libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ - libmagickwand-6.q16hdri-6 \ libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ libpng16-16 \ - libpoppler-glib8 \ libpq5 \ librabbitmq4 \ librdkafka1 \ librecode0 \ - librsvg2-2 \ libssh2-1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx6 \ libwebp6 \ - libwebpdemux2 \ - libwebpmux3 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 95e8304..fcf5a7f 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -9,34 +9,23 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ alien \ - fftw-dev \ firebird-dev \ freetds-dev \ ghostscript \ - gobject-introspection \ - gtk-doc-tools \ libaio-dev \ libbz2-dev \ libc-client-dev \ libcurl4-openssl-dev \ libevent-dev \ - libexif-dev \ - libexpat1-dev \ libfbclient2 \ libffi-dev \ - libfftw3-dev \ libfreetype6-dev \ - libgif-dev \ - libglib2.0-dev \ libgmp-dev \ libib-util \ libicu-dev \ - libimagequant-dev \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - libmagick++-dev \ - libmagickcore-6.q16-dev \ libmagickwand-dev \ libmariadb-dev \ libmcrypt-dev \ @@ -44,22 +33,19 @@ RUN set -eux \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ - libpoppler-glib-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ - librsvg2-dev \ libsasl2-dev \ libsnmp-dev \ libssh2-1-dev \ libssl-dev \ libtidy-dev \ - libtool \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ - libwebpdemux2 \ - libwebpmux3 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -340,14 +326,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \ - && cd /tmp/memcached \ - # Custom: Branch - && git checkout master \ - # Custom: Install command - && phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \ + # Installation: Generic + # Type: PECL extension + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -737,15 +719,6 @@ RUN set -eux \ # -------------------- Installing PHP Extension: vips -------------------- RUN set -eux \ - # Generic pre-command - && git clone https://github.com/libvips/libvips /tmp/libvips \ -&& cd /tmp/libvips \ -&& ./autogen.sh \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ -&& cd /tmp \ -&& rm -rf /tmp/libvips \ - \ # Installation: Generic # Type: PECL extension # Default: Pecl command @@ -876,47 +849,31 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ - fftw2 \ ghostscript \ - gir1.2-poppler-0.18 \ - imagemagick-6.q16 \ libaio1 \ libaspell15 \ libc-client2007e \ - libexif12 \ - libexpat1 \ + libevent-2.1-7 \ libfbclient2 \ libffi7 \ - libfftw3-3 \ libfreetype6 \ - libgif7 \ - libglib2.0-0 \ libicu67 \ - libimagequant0 \ libjpeg62-turbo \ - libmagick++-6.q16-8 \ - libmagick++-6.q16hdri-8 \ - libmagickcore-6.q16-6 \ - libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ - libmagickwand-6.q16hdri-6 \ libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ libpng16-16 \ - libpoppler-glib8 \ libpq5 \ librabbitmq4 \ librdkafka1 \ - librsvg2-2 \ libssh2-1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx6 \ libwebp6 \ - libwebpdemux2 \ - libwebpmux3 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 2d02d3f..ea34af4 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -42,6 +42,8 @@ RUN set -eux \ libsodium-dev \ libssl-dev \ libtidy-dev \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ libxml2-dev \ @@ -307,21 +309,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \ - && cd /tmp/memcached \ - # Custom: Branch - && git checkout master \ - # Custom: Install command - && true \ -# FIXME: This is a work-around to mitigate compile error with PHP 8.0 -&& sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \ -&& phpize \ -&& ./configure --enable-memcached \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ - \ + # Installation: Generic + # Type: PECL extension + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -693,6 +684,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: vips -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install vips \ + # Enabling + && docker-php-ext-enable vips \ + && true + + # -------------------- Installing PHP Extension: xdebug -------------------- RUN set -eux \ # Installation: Generic @@ -807,6 +809,7 @@ RUN set -eux \ libaspell15 \ libc-client2007e \ libenchant-2-2 \ + libevent-2.1-7 \ libfbclient2 \ libffi7 \ libfreetype6 \ @@ -823,6 +826,7 @@ RUN set -eux \ librdkafka1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx6 \ libwebp6 \ libxpm4 \ @@ -1032,6 +1036,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^uploadprogress$' \ && php -m | grep -oiE '^uuid$' \ && php-fpm -m | grep -oiE '^uuid$' \ + && php -m | grep -oiE '^vips$' \ + && php-fpm -m | grep -oiE '^vips$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 76144f8..7954644 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -41,6 +41,8 @@ RUN set -eux \ libsodium-dev \ libssl-dev \ libtidy-dev \ + libvips-dev \ + libvips42 \ libvpx-dev \ libwebp-dev \ libxml2-dev \ @@ -281,21 +283,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \ - && cd /tmp/memcached \ - # Custom: Branch - && git checkout master \ - # Custom: Install command - && true \ -# FIXME: This is a work-around to mitigate compile error with PHP 8.1 -&& sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \ -&& phpize \ -&& ./configure --enable-memcached \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ - \ + # Installation: Generic + # Type: PECL extension + # Custom: Pecl command + && printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \ # Enabling && docker-php-ext-enable memcached \ && true @@ -661,6 +652,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: vips -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install vips \ + # Enabling + && docker-php-ext-enable vips \ + && true + + # -------------------- Installing PHP Extension: xdebug -------------------- RUN set -eux \ # Installation: Version specific @@ -783,6 +785,7 @@ RUN set -eux \ libavif9 \ libc-client2007e \ libenchant-2-2 \ + libevent-2.1-7 \ libfbclient2 \ libffi7 \ libfreetype6 \ @@ -797,6 +800,7 @@ RUN set -eux \ librdkafka1 \ libsybdb5 \ libtidy5deb1 \ + libvips42 \ libvpx6 \ libwebp6 \ libxpm4 \ @@ -1002,6 +1006,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^uploadprogress$' \ && php -m | grep -oiE '^uuid$' \ && php-fpm -m | grep -oiE '^uuid$' \ + && php -m | grep -oiE '^vips$' \ + && php-fpm -m | grep -oiE '^vips$' \ && php -m | grep -oiE '^xdebug$' \ && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index 19e4782..c5f955b 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -772,6 +772,7 @@ RUN set -eux \ libavif9 \ libc-client2007e \ libenchant-2-2 \ + libevent-2.1-7 \ libfbclient2 \ libffi7 \ libfreetype6 \ diff --git a/README.md b/README.md index ba58412..da0c032 100644 --- a/README.md +++ b/README.md @@ -711,12 +711,12 @@ Check out this table to see which Docker image provides what PHP modules. 8.0 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 8.1 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 8.2 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 6a5e9b8..231080d 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -12,7 +12,7 @@ # Extensions to enable (in defined order) # ------------------------------------------------------------------------------------------------- extensions_enabled: - # # ioncube must be loaded first + # ioncube must be loaded first - ioncube - amqp - apcu @@ -147,7 +147,6 @@ extensions_enabled: # command: [required] Custom command to install and enable a module extensions_available: amqp: - disabled: [] 5.2: type: pecl version: 1.6.1 @@ -367,7 +366,6 @@ extensions_available: iconv: already_avail: "{{ php_all_versions }}" igbinary: - disabled: [] 5.2: type: pecl version: 2.0.7 @@ -549,47 +547,35 @@ extensions_available: 5.2: type: pecl version: 2.1.0 + run_dep: [libmemcachedutil2, libevent-2.0-5] 5.3: type: pecl version: 2.2.0 + run_dep: [libmemcachedutil2, libevent-2.0-5] 5.4: type: pecl version: 2.2.0 + run_dep: [libmemcachedutil2, libevent-2.0-5] 5.5: type: pecl version: 2.2.0 + run_dep: [libmemcachedutil2, libevent-2.0-5] 5.6: type: pecl version: 2.2.0 - 7.4: - type: git - git_url: https://github.com/php-memcached-dev/php-memcached - git_ref: master - command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install - 8.0: - type: git - git_url: https://github.com/php-memcached-dev/php-memcached - git_ref: master - command: | - true \ - # FIXME: This is a work-around to mitigate compile error with PHP 8.0 - && sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \ - && phpize \ - && ./configure --enable-memcached \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && make install \ - 8.1: - type: git - git_url: https://github.com/php-memcached-dev/php-memcached - git_ref: master - command: | - true \ - # FIXME: This is a work-around to mitigate compile error with PHP 8.1 - && sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \ - && phpize \ - && ./configure --enable-memcached \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && make install \ + run_dep: [libmemcachedutil2, libevent-2.0-5] + 7.0: + type: pecl + command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached + run_dep: [libmemcachedutil2, libevent-2.0-5] + 7.1: + type: pecl + command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached + run_dep: [libmemcachedutil2, libevent-2.1-6] + 7.2: + type: pecl + command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached + run_dep: [libmemcachedutil2, libevent-2.1-6] 8.2: type: git git_url: https://github.com/php-memcached-dev/php-memcached @@ -604,8 +590,9 @@ extensions_available: && make install \ all: type: pecl + command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached build_dep: [zlib1g-dev, libmemcached-dev, libevent-dev] - run_dep: [libmemcachedutil2] + run_dep: [libmemcachedutil2, libevent-2.1-7] mhash: disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated already_avail: [5.2, 5.3, 5.4, 5.5, 5.6] @@ -1263,96 +1250,18 @@ extensions_available: run_dep: [uuid] build_dep: [uuid-dev] vips: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1, 8.2] - 7.0: - build_dep: - - fftw-dev - - gobject-introspection - - gtk-doc-tools - - libexif-dev - - libexpat1-dev - - libfftw3-dev - - libgif-dev - - libglib2.0-dev - - libmagick++-dev - - libmagickcore-6.q16-dev - - libmagickwand-dev - - libpoppler-glib-dev - - librsvg2-dev - - libtool - - libwebp-dev - - libwebpdemux2 - - libwebpmux2 - run_dep: - - fftw2 - - gir1.2-poppler-0.18 - - imagemagick-6.q16 - - libexif12 - - libexpat1 - - libfftw3-3 - - libgif7 - - libglib2.0-0 - - libmagick++-6.q16-7 - - libmagick++-6.q16hdri-7 - - libmagickcore-6.q16-3 - - libmagickcore-6.q16-3-extra - - libmagickwand-6.q16-3 - - libmagickwand-6.q16hdri-3 - - libpoppler-glib8 - - librsvg2-2 - - libwebp6 - - libwebpdemux2 - - libwebpmux2 + # vips requires PHP > 5.6 + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.2] + 5.6: + type: pecl + version: 1.0.0 all: type: pecl - pre: | - git clone https://github.com/libvips/libvips /tmp/libvips \ - && cd /tmp/libvips \ - && ./autogen.sh \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && make install \ - && cd /tmp \ - && rm -rf /tmp/libvips \ build_dep: - - fftw-dev - - gobject-introspection - - gtk-doc-tools - - libexif-dev - - libexpat1-dev - - libfftw3-dev - - libgif-dev - - libglib2.0-dev - - libimagequant-dev - - libmagick++-dev - - libmagickcore-6.q16-dev - - libmagickwand-dev - - libpoppler-glib-dev - - librsvg2-dev - - libtool - - libwebp-dev - - libwebpdemux2 - - libwebpmux3 + - libvips-dev + - libvips42 run_dep: - - fftw2 - - gir1.2-poppler-0.18 - - imagemagick-6.q16 - - libexif12 - - libexpat1 - - libfftw3-3 - - libgif7 - - libglib2.0-0 - - libimagequant0 - - libmagick++-6.q16-8 - - libmagick++-6.q16hdri-8 - - libmagickcore-6.q16-6 - - libmagickcore-6.q16-6-extra - - libmagickwand-6.q16-6 - - libmagickwand-6.q16hdri-6 - - libpoppler-glib8 - - librsvg2-2 - - libwebp6 - - libwebpdemux2 - - libwebpmux3 + - libvips42 wddx: # https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx disabled: [7.4, 8.0, 8.1, 8.2]