imap has been removed from core in 8.4

htuscher · htuscher · commit 4997725ff832 · 2025-02-22T16:26:46.000+07:00
diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile
@@ -148,7 +148,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -159,7 +159,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         hash \
         pcntl \
diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile
@@ -148,7 +148,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -159,7 +159,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         hash \
         pcntl \
diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile
@@ -148,7 +148,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -159,7 +159,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         hash \
         pcntl \
diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && docker-php-ext-configure intl --with-icu-dir=/usr/local \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile
@@ -151,7 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -165,7 +165,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         pcntl \
         pdo_mysql \
diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile
@@ -142,7 +142,7 @@ RUN set -x \
     && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile
@@ -151,7 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -165,7 +165,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         pcntl \
         pdo_mysql \
diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile
@@ -144,7 +144,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         amqp \
diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile
@@ -149,7 +149,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -163,7 +163,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         pcntl \
         pdo_mysql \
diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile
@@ -144,7 +144,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         amqp \
diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile
@@ -149,7 +149,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -163,7 +163,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         pcntl \
         pdo_mysql \
diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile
@@ -144,7 +144,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         amqp \
diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile
@@ -149,7 +149,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -163,7 +163,7 @@ RUN set -x \
         intl \
         gettext \
         ldap \
-        mysqli \
+        mysqli \        
         imap \
         pcntl \
         pdo_mysql \
diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile
@@ -144,7 +144,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \    
     && docker-php-ext-install \
         bcmath \
         amqp \
diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile
@@ -148,8 +148,7 @@ RUN set -x \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
-    && docker-php-ext-configure ldap \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && docker-php-ext-configure ldap \    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -164,7 +163,6 @@ RUN set -x \
         gettext \
         ldap \
         mysqli \
-        imap \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile
@@ -143,8 +143,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \    
     && docker-php-ext-install \
         bcmath \
         amqp \
@@ -159,7 +158,6 @@ RUN set -x \
         gettext \
         ldap \
         mysqli \
-        imap \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -78,7 +78,9 @@
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
 {%- endif %}
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+{%- if version != '8.4' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+{%- endif %}    
     && docker-php-ext-install \
         bcmath \
 {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
@@ -98,7 +100,9 @@
 {%- if version|int == 5 or version == '7.0' or version == '7.1' %}
         mcrypt \
 {%- endif %}
+{%- if version != '8.4' %}
         imap \
+{%- endif %}
 {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %}
         hash \
 {%- endif %}
@@ -273,7 +277,9 @@
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
 {%- endif %}
     && docker-php-ext-configure ldap \
+{%- if version != '8.4' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+{%- endif %}    
     && docker-php-ext-install \
         bcmath \
         bz2 \
@@ -290,7 +296,9 @@
         gettext \
         ldap \
         mysqli \
+{%- if version != '8.4' %}        
         imap \
+{%- endif %}     
 {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %}
         hash \
 {%- endif %}
