Runs update.sh

3 files changed, 24 insertions, 24 deletions

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 \
+        libwebp-dev \
         libxml2-dev \
-        libmagickwand-dev \
         libzip-dev \
-        libwebp-dev \
-        libgmp-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 \
+        libwebp-dev \
         libxml2-dev \
-        libmagickwand-dev \
         libzip-dev \
-        libwebp-dev \
-        libgmp-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; \
     \