From 321d0b29a0dbf40254e63b598da40f8cae75f1f4 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:45:38 +0000
Subject: Remove EOL 23 (#1951)

* Remove EOL 23

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

* Clenaup GMP extension installation

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

---------

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
---
 Dockerfile-debian.template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'Dockerfile-debian.template')

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index f553dc84..a9de46ce 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -5,11 +5,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/*; \
     \
@@ -29,29 +29,28 @@ 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)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
@@ -59,20 +58,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-%%APCU_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
-    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
-- 
cgit v1.2.3