From 1bccf76b2a218377f525d0c13f4b71535b6ed9b7 Mon Sep 17 00:00:00 2001
From: Jose Quintana <1700322+joseluisq@users.noreply.github.com>
Date: Mon, 28 Oct 2024 01:51:22 +0100
Subject: [PATCH] v8.3.13 (#48)

* v8.3.13

- php 8.3.13
- composer 2.8.1
- swoole 5.1.5
- phalcon 5.8.0

* chore: add source imagick extension to php 8.3.13
---
 8.3-fpm/Dockerfile     | 43 ++++++++++++++++++++++++++----------------
 8.3-fpm/extensions.txt |  2 ++
 README.md              |  6 +++---
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/8.3-fpm/Dockerfile b/8.3-fpm/Dockerfile
index 6b958dd..d73fe07 100644
--- a/8.3-fpm/Dockerfile
+++ b/8.3-fpm/Dockerfile
@@ -1,17 +1,20 @@
-FROM php:8.3.12-fpm-alpine3.19
+FROM php:8.3.13-fpm-alpine3.19
 
 LABEL Maintainer="Jose Quintana <joseluisq.net>" \
     Description="PHP-FPM v8.3 with essential extensions on top of Alpine Linux."
 
 # Composer - https://getcomposer.org/download/
-ARG COMPOSER_VERSION="2.7.9"
-ARG COMPOSER_SUM="b6de5e65c199d80ba11897fbe1364e063e858d483f6a81a176c4d60f2b1d6347"
+ARG COMPOSER_VERSION="2.8.1"
+ARG COMPOSER_SUM="930b376fbd2147a623ea7b704eb9d3b8b0d6072992207aa0535aa21f6f05378e"
 
 # Swoole - https://github.com/swoole/swoole-src
-ARG SWOOLE_VERSION="5.1.4"
+ARG SWOOLE_VERSION="5.1.5"
 
 # # Phalcon - https://github.com/phalcon/cphalcon
-# ARG PHALCON_VERSION="5.7.0"
+ARG PHALCON_VERSION="5.8.0"
+
+# Imagick - https://github.com/Imagick/imagick
+ARG IMAGICK_COMMIT="28f27044e435a2b203e32675e942eb8de620ee58"
 
 # Install dependencies
 RUN set -eux \
@@ -154,10 +157,18 @@ RUN set -eux \
     && docker-php-ext-install -j$(nproc) imap \
     && true \
 \
-# # Install imagick
-#     && pecl install imagick \
-#     && docker-php-ext-enable imagick \
-#     && true \
+# Install imagick from source (temporarily)
+    && mkdir -p /opt/imagick \
+    && cd /opt/imagick \
+    && git init \
+    && git remote add origin https://github.com/Imagick/imagick.git \
+    && git fetch origin ${IMAGICK_COMMIT} \
+    && git checkout ${IMAGICK_COMMIT} \
+    && phpize && ./configure \
+    && make -j$(nproc) \
+    && make -j$(nproc) install \
+    && docker-php-ext-enable imagick \
+    && true \
 \
 # Install igbinary
     && pecl install igbinary \
@@ -219,13 +230,13 @@ RUN set -eux \
     && docker-php-ext-install -j$(nproc) pcntl \
     && true \
 \
-# # Install phalcon
-#     && git clone --depth=1 --branch=v${PHALCON_VERSION} https://github.com/phalcon/cphalcon.git /opt/phalcon \
-#     && cd /opt/phalcon/build \
-#     && sh ./install \
-#     && docker-php-ext-enable phalcon \
-#     && true \
-# \
+# Install phalcon
+    && git clone --depth=1 --branch=v${PHALCON_VERSION} https://github.com/phalcon/cphalcon.git /opt/phalcon \
+    && cd /opt/phalcon/build \
+    && sh ./install \
+    && docker-php-ext-enable phalcon \
+    && true \
+\
 # Install pdo_pgsql
     && docker-php-ext-install -j$(nproc) pdo_pgsql \
     && true \
diff --git a/8.3-fpm/extensions.txt b/8.3-fpm/extensions.txt
index c109893..37945be 100644
--- a/8.3-fpm/extensions.txt
+++ b/8.3-fpm/extensions.txt
@@ -7,6 +7,7 @@ gd
 gettext
 gmp
 igbinary
+imagick
 imap
 intl
 lz4
@@ -22,6 +23,7 @@ pdo_mysql
 pdo_pgsql
 pdo_sqlsrv
 pgsql
+phalcon
 psr
 rdkafka
 redis
diff --git a/README.md b/README.md
index 3960a9a..b2ea788 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ However, you can still find legacy versions like `7.4.x` or `8.0.x` on [Releases
 | gd         |      ✓ |      ✓ |      ✓ |
 | gettext    |      ✓ |      ✓ |      ✓ |
 | gmp        |      ✓ |      ✓ |      ✓ |
-| imagick    |      ✓ |      ✓ |      ? |
+| imagick    |      ✓ |      ✓ |      ✓ |
 | igbinary   |      ✓ |      ✓ |      ✓ |
 | imap       |      ✓ |      ✓ |      ✓ |
 | intl       |      ✓ |      ✓ |      ✓ |
@@ -66,7 +66,7 @@ However, you can still find legacy versions like `7.4.x` or `8.0.x` on [Releases
 | pdo_pgsql  |      ✓ |      ✓ |      ✓ |
 | pdo_sqlsrv |      ✓ <sup>(64-bit only)</sub> |     ✓ <sup>(64-bit only)</sub> |     ✓ <sup>(64-bit only)</sub> |
 | pgsql      |      ✓ |      ✓ |      ✓ |
-| phalcon    |      ✓ |      ✓ |      ? |
+| phalcon    |      ✓ |      ✓ |      ✓ |
 | psr        |      ✓ |      ✓ |      ✓ |
 | redis      |      ✓ |      ✓ |      ✓ |
 | rdkafka    |      ✓ |      ✓ |      ✓ |
@@ -88,7 +88,7 @@ However, you can still find legacy versions like `7.4.x` or `8.0.x` on [Releases
 | zstd       |      ✓ |      ✓ |      ✓ |
 | &nbsp;     | &nbsp; | &nbsp; | &nbsp; |
 | **Others** |        |        |        |
-| composer   |   v2.7 |   v2.8 |   v2.7 |
+| composer   |   v2.7 |   v2.8 |   v2.8 |
 | &nbsp;     | &nbsp; | &nbsp; | &nbsp; |
 | **Extensions file**   |   [8.1-fpm/extensions.txt](8.1-fpm/extensions.txt) |  [8.2-fpm/extensions.txt](8.2-fpm/extensions.txt)  |  [8.3-fpm/extensions.txt](8.3-fpm/extensions.txt)  |