From 6cb8913dc4e126b1bfc348b3d95d62c51591986d Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Tue, 21 Mar 2023 18:46:08 +0000 Subject: [PATCH] Runs update.sh --- 24/apache/Dockerfile | 1 - 24/fpm-alpine/Dockerfile | 1 - 24/fpm/Dockerfile | 1 - 25/apache/Dockerfile | 1 - 25/fpm-alpine/Dockerfile | 1 - 25/fpm/Dockerfile | 1 - 26/apache/Dockerfile | 18 +++++++++--------- 26/fpm-alpine/Dockerfile | 16 ++++++++-------- 26/fpm/Dockerfile | 18 +++++++++--------- 9 files changed, 26 insertions(+), 32 deletions(-) diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index 5b9ee78d..96726137 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -58,7 +58,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 554c75e9..d49534e1 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -49,7 +49,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index b170f860..e23484b7 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -58,7 +58,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index 080bb239..0fe6ec73 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -58,7 +58,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index edf1f500..f7a45206 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -49,7 +49,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 224607b7..87830c6c 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -58,7 +58,6 @@ RUN set -ex; \ pcntl \ pdo_mysql \ pdo_pgsql \ - sysvsem \ zip \ ; \ \ diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile index e2991308..c87f0477 100644 --- a/26/apache/Dockerfile +++ b/26/apache/Dockerfile @@ -6,11 +6,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - rsync \ - bzip2 \ busybox-static \ + bzip2 \ libldap-common \ libmagickcore-6.q16-6-extra \ + rsync \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -30,18 +30,18 @@ RUN set -ex; \ libcurl4-openssl-dev \ libevent-dev \ libfreetype6-dev \ + libgmp-dev \ libicu-dev \ libjpeg-dev \ libldap2-dev \ + libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ - libxml2-dev \ - libmagickwand-dev \ - libzip-dev \ libwebp-dev \ - libgmp-dev \ + libxml2-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ @@ -51,6 +51,7 @@ RUN set -ex; \ bcmath \ exif \ gd \ + gmp \ intl \ ldap \ opcache \ @@ -58,20 +59,19 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ - gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.22; \ + pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ - pecl install imagick-3.7.0; \ \ docker-php-ext-enable \ apcu \ + imagick \ memcached \ redis \ - imagick \ ; \ rm -r /tmp/pear; \ \ diff --git a/26/fpm-alpine/Dockerfile b/26/fpm-alpine/Dockerfile index 43b5bf57..167544c0 100644 --- a/26/fpm-alpine/Dockerfile +++ b/26/fpm-alpine/Dockerfile @@ -5,8 +5,8 @@ FROM php:8.1-fpm-alpine3.16 RUN set -ex; \ \ apk add --no-cache \ - rsync \ imagemagick \ + rsync \ ; \ \ rm /var/spool/cron/crontabs/root; \ @@ -20,20 +20,20 @@ RUN set -ex; \ $PHPIZE_DEPS \ autoconf \ freetype-dev \ + gmp-dev \ icu-dev \ + imagemagick-dev \ libevent-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ - libpng-dev \ libmemcached-dev \ + libpng-dev \ + libwebp-dev \ libxml2-dev \ libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ - imagemagick-dev \ - libwebp-dev \ - gmp-dev \ ; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ @@ -42,6 +42,7 @@ RUN set -ex; \ bcmath \ exif \ gd \ + gmp \ intl \ ldap \ opcache \ @@ -49,20 +50,19 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ - gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.22; \ + pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ - pecl install imagick-3.7.0; \ \ docker-php-ext-enable \ apcu \ + imagick \ memcached \ redis \ - imagick \ ; \ rm -r /tmp/pear; \ \ diff --git a/26/fpm/Dockerfile b/26/fpm/Dockerfile index 8a4a1261..cde56e3c 100644 --- a/26/fpm/Dockerfile +++ b/26/fpm/Dockerfile @@ -6,11 +6,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - rsync \ - bzip2 \ busybox-static \ + bzip2 \ libldap-common \ libmagickcore-6.q16-6-extra \ + rsync \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -30,18 +30,18 @@ RUN set -ex; \ libcurl4-openssl-dev \ libevent-dev \ libfreetype6-dev \ + libgmp-dev \ libicu-dev \ libjpeg-dev \ libldap2-dev \ + libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ - libxml2-dev \ - libmagickwand-dev \ - libzip-dev \ libwebp-dev \ - libgmp-dev \ + libxml2-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ @@ -51,6 +51,7 @@ RUN set -ex; \ bcmath \ exif \ gd \ + gmp \ intl \ ldap \ opcache \ @@ -58,20 +59,19 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ - gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.22; \ + pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ - pecl install imagick-3.7.0; \ \ docker-php-ext-enable \ apcu \ + imagick \ memcached \ redis \ - imagick \ ; \ rm -r /tmp/pear; \ \