From 7c3e703acd5a295333469fa0728b464895b12113 Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Tue, 28 Nov 2023 23:20:53 +0100
Subject: [PATCH] v8.1.26

---
 .github/workflows/devel-8.1.yml   |  4 +++-
 .github/workflows/release-8.1.yml |  4 ++--
 8.1-fpm/Dockerfile                | 40 +++++++++++++++++++++++++++----
 Makefile                          |  3 ++-
 README.md                         |  4 ++++
 5 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/devel-8.1.yml b/.github/workflows/devel-8.1.yml
index 2c937f9..394d7d8 100644
--- a/.github/workflows/devel-8.1.yml
+++ b/.github/workflows/devel-8.1.yml
@@ -5,15 +5,17 @@ on:
       - master
     paths:
       - 8.1-fpm/**
+      - .github/workflows/devel-8.1.yml
   push:
     branches:
       - master
     paths:
       - 8.1-fpm/**
+      - .github/workflows/devel-8.1.yml
 
 jobs:
   php:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         build:
diff --git a/.github/workflows/release-8.1.yml b/.github/workflows/release-8.1.yml
index 8280379..18dbad8 100644
--- a/.github/workflows/release-8.1.yml
+++ b/.github/workflows/release-8.1.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   docker-build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         build:
@@ -66,7 +66,7 @@ jobs:
 
   docker-manifest:
     needs: docker-build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set envs
         run: |
diff --git a/8.1-fpm/Dockerfile b/8.1-fpm/Dockerfile
index 9895b65..4e3bfc5 100644
--- a/8.1-fpm/Dockerfile
+++ b/8.1-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1.25-fpm-alpine3.17
+FROM php:8.1.26-fpm-alpine3.17
 
 LABEL Maintainer="Jose Quintana <joseluisq.net>" \
     Description="PHP-FPM v8.1 with essential extensions on top of Alpine Linux."
@@ -8,7 +8,7 @@ ARG COMPOSER_VERSION="2.6.5"
 ARG COMPOSER_SUM="9a18e1a3aadbcb94c1bafd6c4a98ff931f4b43a456ef48575130466e19f05dd6"
 
 # Swoole - https://github.com/swoole/swoole-src
-ARG SWOOLE_VERSION="5.1.0"
+ARG SWOOLE_VERSION="5.1.1"
 
 # Phalcon - https://github.com/phalcon/cphalcon
 ARG PHALCON_VERSION="5.4.0"
@@ -38,13 +38,16 @@ RUN set -eux \
         libxpm \
         libxslt \
         libzip \
+        lz4-libs \
         make \
         rabbitmq-c \
         tidyhtml \
         tzdata \
         unixodbc \
         vips \
-        yaml
+        yaml \
+        zstd-libs \
+    && true
 
 #############################################
 ### Install and enable PHP extensions
@@ -78,6 +81,7 @@ RUN set -eux \
         libxpm-dev \
         libxslt-dev \
         libzip-dev \
+        lz4-dev \
         openssl-dev \
         pcre-dev \
         pkgconf \
@@ -155,10 +159,26 @@ RUN set -eux \
     && docker-php-ext-enable imagick \
     && true \
 \
+# Install igbinary
+    && pecl install igbinary \
+    && docker-php-ext-enable igbinary \
+\
 # Install intl
     && docker-php-ext-install -j$(nproc) intl \
     && true \
 \
+# Install lz4
+    && git clone https://github.com/kjdev/php-ext-lz4 /tmp/lz4-ext \
+    && cd /tmp/lz4-ext \
+    && git checkout $(git tag | grep -E '^[.0-9]+$' | sort -V | tail -1) \
+    && phpize \
+    && ./configure --enable-lz4 --with-lz4-includedir=/usr \
+    && make -j$(nproc) \
+    && make install \
+    && docker-php-ext-enable lz4 \
+    && rm -rf /tmp/lz4-ext \
+    && true \
+\
 ## Install mcrypt
 ## DEPRECATED: This dependency is dead so move to `libsodium` or `openssl`
 ##     && pecl install mcrypt-1.0.4 \
@@ -175,6 +195,11 @@ RUN set -eux \
     && docker-php-ext-enable mongodb \
     && true \
 \
+# Install msgpack
+    && pecl install msgpack \
+    && docker-php-ext-enable msgpack \
+    && true \
+\
 # Install mysqli
     && docker-php-ext-install -j$(nproc) mysqli \
     && true \
@@ -234,7 +259,9 @@ RUN set -eux \
     && true \
 \
 # Install redis
-    && pecl install redis \
+    && pecl install --configureoptions \
+        'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-msgpack="yes" enable-redis-lz4="yes"' \
+        redis \
     && docker-php-ext-enable redis \
     && true \
 \
@@ -282,6 +309,11 @@ RUN set -eux \
     && docker-php-ext-install -j$(nproc) tidy \
     && true \
 \
+# Install uuid
+    && pecl install uuid \
+    && docker-php-ext-enable uuid \
+    && true \
+\
 # Install xsl
     && docker-php-ext-install -j$(nproc) xsl \
     && true \
diff --git a/Makefile b/Makefile
index 290c7aa..0a35387 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 REPOSITORY ?= joseluisq
 TAG ?= latest
+VERSION ?= 8.3
 
 
 build:
 	docker build --progress=plain --network=host \
 		-t $(REPOSITORY)/php-fpm:$(TAG) \
-		-f Dockerfile .
+		-f $(VERSION)-fpm/Dockerfile .
 .PHONY: build
 
 dev:
diff --git a/README.md b/README.md
index 99cd013..403fbc9 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,14 @@ _**Note:** we only provide stable PHP versions._
 | gettext    |      ✓ |      ✓ |      ✓ |      ✓ |
 | gmp        |      ✓ |      ✓ |      ✓ |      ✓ |
 | imagick    |      ✓ |      ✓ |      ✓ |      ? |
+| igbinary   |      ? |      ✓ |      ? |      ? |
 | imap       |      ✓ |      ✓ |      ✓ |      ✓ |
 | intl       |      ✓ |      ✓ |      ✓ |      ✓ |
+| lz4        |      ? |      ✓ |      ? |      ? |
 | mcrypt     |      ✓ |      ? |      ? |      ? |
 | memcache   |      ✓ |      ✓ |      ✓ |      ✓ |
 | mongodb    |      ✓ |      ✓ |      ✓ |      ✓ |
+| msgpack    |      ? |      ✓ |      ? |      ? |
 | mysqli     |      ✓ |      ✓ |      ✓ |      ✓ |
 | oauth      |      ✓ |      ✓ |      ✓ |      ✓ |
 | opcache    |      ✓ |      ✓ |      ✓ |      ✓ |
@@ -74,6 +77,7 @@ _**Note:** we only provide stable PHP versions._
 | sysvsem    |      ✓ |      ✓ |      ✓ |      ✓ |
 | sysvshm    |      ✓ |      ✓ |      ✓ |      ✓ |
 | tidy       |      ✓ |      ✓ |      ✓ |      ✓ |
+| uuid       |      ? |      ✓ |      ? |      ? |
 | vips       |      ✓ |      ✓ |      ✓ |      ✓ |
 | xdebug     |      ✓ |      ✓ |      ✓ |      ? |
 | xsl        |      ✓ |      ✓ |      ✓ |      ✓ |