From 7098f971fd3596d1a6f88285a77f45feb1041fe8 Mon Sep 17 00:00:00 2001
From: dannc <dannc.sao@gmail.com>
Date: Fri, 22 Nov 2024 13:07:30 +0700
Subject: [PATCH] fix php 8.4 dockerfile

fix makefile, fix docker warnings
---
 Makefile        | 10 +++++-----
 readme.md       |  2 ++
 v7.2/Dockerfile |  2 +-
 v7.3/Dockerfile |  2 +-
 v7.4/Dockerfile |  2 +-
 v8.0/Dockerfile |  2 +-
 v8.1/Dockerfile |  2 +-
 v8.2/Dockerfile |  2 +-
 v8.3/Dockerfile |  2 +-
 v8.4/Dockerfile |  6 ++----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 14606a3..b7e04fd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,16 @@ build-74:
 	cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.4 `pwd`
 
 build-80:
-	cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.0 `pwd`
+	cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:8.0 `pwd`
 
 build-81:
-	cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.1 `pwd`
+	cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:8.1 `pwd`
 
 build-82:
-	cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.2 `pwd`
+	cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:8.2 `pwd`
 
 build-83:
-	cd ./v8.3 && docker build --build-arg composer_version=${composer_version} ---build-arg php_xdebug_version=${xdebug_version} -tag=php-for-dev:8.3 `pwd`
+	cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:8.3 `pwd`
 
 build-84:
-	cd ./v8.4 && docker build --build-arg composer_version=${composer_version} ---build-arg php_xdebug_version=${xdebug_version} -tag=php-for-dev:8.4 `pwd` 
+	cd ./v8.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:8.4 `pwd` 
diff --git a/readme.md b/readme.md
index 2b9498f..14756a5 100644
--- a/readme.md
+++ b/readme.md
@@ -7,6 +7,8 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan
 #### Supported versions
 
 * php 8.4.1
+  * removed `imap` extension ([reason](https://wiki.php.net/rfc/unbundle_imap_pspell_oci8))
+  * _temporary_ removed `xdebug` extension
 * php 8.3.14
 * php 8.2.26
 * php 8.1.31
diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile
index 904ecdd..b8ac659 100644
--- a/v7.2/Dockerfile
+++ b/v7.2/Dockerfile
@@ -40,4 +40,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile
index 4d0dd34..3b9dd0e 100644
--- a/v7.3/Dockerfile
+++ b/v7.3/Dockerfile
@@ -41,4 +41,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile
index 258c65d..9b75973 100644
--- a/v7.4/Dockerfile
+++ b/v7.4/Dockerfile
@@ -40,4 +40,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile
index f9f5612..c1b202a 100644
--- a/v8.0/Dockerfile
+++ b/v8.0/Dockerfile
@@ -29,4 +29,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile
index 50ad9ef..a7168e8 100644
--- a/v8.1/Dockerfile
+++ b/v8.1/Dockerfile
@@ -27,4 +27,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v8.2/Dockerfile b/v8.2/Dockerfile
index 05798a3..d4b03ea 100644
--- a/v8.2/Dockerfile
+++ b/v8.2/Dockerfile
@@ -27,4 +27,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v8.3/Dockerfile b/v8.3/Dockerfile
index bd3c5f0..f46eaf0 100644
--- a/v8.3/Dockerfile
+++ b/v8.3/Dockerfile
@@ -27,4 +27,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/
diff --git a/v8.4/Dockerfile b/v8.4/Dockerfile
index 1d47cc7..936c0bd 100644
--- a/v8.4/Dockerfile
+++ b/v8.4/Dockerfile
@@ -15,9 +15,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \
     && docker-php-ext-configure zip --with-zip && docker-php-ext-install zip \
     && docker-php-ext-install gmp \
-    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \
-    && docker-php-ext-install imap \
-    && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
+    #&& pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
     && apk del $PHPIZE_DEPS \
         zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev
 
@@ -27,4 +25,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
         --version=${COMPOSER_VERSION} \
         --install-dir=/usr/local/bin
 RUN mkdir -m 777 -p /var/composer/
-ENV COMPOSER_HOME /var/composer/
+ENV COMPOSER_HOME=/var/composer/