From 8151bcc2c95bdf19aa70a12cf07c8ecca5c17a3d Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 12 Sep 2024 08:59:03 +0100 Subject: [PATCH 1/6] PHP 8.4.0beta5 --- php-84/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-84/Dockerfile b/php-84/Dockerfile index 12e957e7..98be8919 100644 --- a/php-84/Dockerfile +++ b/php-84/Dockerfile @@ -4,8 +4,8 @@ ARG IMAGE_VERSION_SUFFIX # https://www.php.net/downloads -ARG RELEASE_USER_PHP=saki -ARG VERSION_PHP=8.4.0beta4 +ARG RELEASE_USER_PHP=calvinb +ARG VERSION_PHP=8.4.0beta5 # Lambda uses a custom AMI named Amazon Linux 2 From 4c901b157f4fc3a77937506e91c9184397056727 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Sep 2024 12:43:01 +0100 Subject: [PATCH 2/6] Install apcu from source --- php-83/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 73aed9fa..7cc68c86 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -483,8 +483,9 @@ RUN set -xe; \ # Install extensions -# We can install extensions manually or using `pecl` -RUN pecl install APCu +RUN git clone https://github.com/krakjoe/apcu.git \ + && cd apcu && git reset --hard 3299efc0987499d468693a3aa5c7e9d5548c4525 \ + && phpize && ./configure && make && make install && cd ../ && rm -rf apcu # --------------------------------------------------------------- From 93969d517b01a4558ba6bf09d41bbb12ed0762e0 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Sep 2024 13:08:18 +0100 Subject: [PATCH 3/6] Revert "Install apcu from source" This reverts commit 4c901b157f4fc3a77937506e91c9184397056727. --- php-83/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 7cc68c86..73aed9fa 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -483,9 +483,8 @@ RUN set -xe; \ # Install extensions -RUN git clone https://github.com/krakjoe/apcu.git \ - && cd apcu && git reset --hard 3299efc0987499d468693a3aa5c7e9d5548c4525 \ - && phpize && ./configure && make && make install && cd ../ && rm -rf apcu +# We can install extensions manually or using `pecl` +RUN pecl install APCu # --------------------------------------------------------------- From ba61cbbd6e665b12feba7c1005ca0d968abd4f86 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Sep 2024 13:08:45 +0100 Subject: [PATCH 4/6] Install apcu from source --- php-84/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/php-84/Dockerfile b/php-84/Dockerfile index 98be8919..b96e9591 100644 --- a/php-84/Dockerfile +++ b/php-84/Dockerfile @@ -487,7 +487,9 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +RUN git clone https://github.com/krakjoe/apcu.git \ + && cd apcu && git reset --hard 3299efc0987499d468693a3aa5c7e9d5548c4525 \ + && phpize && ./configure && make && make install && cd ../ && rm -rf apcu # --------------------------------------------------------------- From 1c93fb7afbe08bab8b01396c1cfdd66df75a400b Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 22 Sep 2024 11:03:40 +0100 Subject: [PATCH 5/6] Revert "Install apcu from source" This reverts commit ba61cbbd6e665b12feba7c1005ca0d968abd4f86. --- php-84/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/php-84/Dockerfile b/php-84/Dockerfile index b96e9591..98be8919 100644 --- a/php-84/Dockerfile +++ b/php-84/Dockerfile @@ -487,9 +487,7 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN git clone https://github.com/krakjoe/apcu.git \ - && cd apcu && git reset --hard 3299efc0987499d468693a3aa5c7e9d5548c4525 \ - && phpize && ./configure && make && make install && cd ../ && rm -rf apcu +RUN pecl install APCu # --------------------------------------------------------------- From 2072e7d89d39ef18b2a480c69a970823db47a1a2 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 22 Sep 2024 11:06:41 +0100 Subject: [PATCH 6/6] apcu 5.1.24 --- php-80/Dockerfile | 3 ++- php-81/Dockerfile | 3 ++- php-82/Dockerfile | 3 ++- php-83/Dockerfile | 3 ++- php-84/Dockerfile | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 1f29bab0..652a5a6d 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -464,7 +464,8 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +ENV VERSION_APCU=5.1.24 +RUN pecl install apcu-${VERSION_APCU} # --------------------------------------------------------------- diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 2922739b..b469ca9c 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -465,7 +465,8 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +ENV VERSION_APCU=5.1.24 +RUN pecl install apcu-${VERSION_APCU} # --------------------------------------------------------------- diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 33698394..2537a261 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -484,7 +484,8 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +ENV VERSION_APCU=5.1.24 +RUN pecl install apcu-${VERSION_APCU} # --------------------------------------------------------------- diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 73aed9fa..96d200ae 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -484,7 +484,8 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +ENV VERSION_APCU=5.1.24 +RUN pecl install apcu-${VERSION_APCU} # --------------------------------------------------------------- diff --git a/php-84/Dockerfile b/php-84/Dockerfile index 98be8919..f06686b0 100644 --- a/php-84/Dockerfile +++ b/php-84/Dockerfile @@ -487,7 +487,8 @@ RUN set -xe; \ # Install extensions # We can install extensions manually or using `pecl` -RUN pecl install APCu +ENV VERSION_APCU=5.1.24 +RUN pecl install apcu-${VERSION_APCU} # ---------------------------------------------------------------