From 1930c72afa831752fee99133dac0c957946d7aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Thu, 3 Feb 2022 20:28:44 +0100
Subject: [PATCH 1/4] Force makasim/nginx-php-fpm for thruway Docker service

---
 docker/thruway/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/thruway/Dockerfile b/docker/thruway/Dockerfile
index 3bca735b2..042a49d64 100644
--- a/docker/thruway/Dockerfile
+++ b/docker/thruway/Dockerfile
@@ -1,4 +1,4 @@
-FROM makasim/nginx-php-fpm:latest-all-exts
+FROM makasim/nginx-php-fpm:7.4-all-exts
 
 RUN mkdir -p /thruway
 WORKDIR /thruway

From d23df867f4f60aa63fb04110b86f9b9c3fea62ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Thu, 3 Feb 2022 21:17:40 +0100
Subject: [PATCH 2/4] Fix PEAR/pecl usage in Docker

---
 docker/Dockerfile | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30f013cb8..da12c39a5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,13 +22,20 @@ RUN set -x && \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-mysql \
         php${PHP_VERSION}-curl \
-        libgearman-dev \
-        php-pear \
         make \
-        unzip \
+        g++ \
+        unzip
+
+## gearman
+RUN set -x && \
+    apt-get install -y --no-install-recommends --no-install-suggests \
+        libgearman-dev \
     && \
-    pecl channel-update pecl.php.net && \
-    pecl install gearman && \
+    mkdir -p $HOME/gearman && \
+    cd $HOME/gearman && \
+    git clone https://github.com/php/pecl-networking-gearman.git . && \
+    git checkout gearman-2.1.0 && \
+    phpize && ./configure && make && make install && \
     if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini ]; then \
         echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini && \
         echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/20-gearman.ini \
@@ -37,16 +44,19 @@ RUN set -x && \
 
 ## librdkafka
 RUN set -x && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        g++ \
-    && \
     mkdir -p $HOME/librdkafka && \
     cd $HOME/librdkafka && \
     git clone https://github.com/edenhill/librdkafka.git . && \
     git checkout v1.0.0 && \
-    ./configure && make && make install && \
-    pecl install rdkafka && \
+    ./configure && make && make install
+
+## php-rdkafka
+RUN set -x && \
+    mkdir -p $HOME/php-rdkafka && \
+    cd $HOME/php-rdkafka && \
+    git clone https://github.com/arnaud-lb/php-rdkafka.git . && \
+    git checkout 5.0.1 && \
+    phpize && ./configure && make all && make install && \
     echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-rdkafka.ini && \
     echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-rdkafka.ini
 

From c3901cd398193d433f402b5c5cd477f6c8ad2587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Thu, 3 Feb 2022 21:37:27 +0100
Subject: [PATCH 3/4] Fix PHP version usage in Docker container

---
 docker/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index da12c39a5..b1e0d8b03 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,7 +24,9 @@ RUN set -x && \
         php${PHP_VERSION}-curl \
         make \
         g++ \
-        unzip
+        unzip \
+    && \
+    update-alternatives --install /usr/bin/php php /usr/bin/php${PHP_VERSION} 100
 
 ## gearman
 RUN set -x && \

From a0cc3ea8e26998c80fff7d7d56b406c33b0618c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Thu, 3 Feb 2022 22:07:07 +0100
Subject: [PATCH 4/4] Fix guzzlehttp/psr7 version

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 5153ac607..da4d3960c 100644
--- a/composer.json
+++ b/composer.json
@@ -47,6 +47,7 @@
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3",
     "guzzlehttp/guzzle": "^7.0.1",
+    "guzzlehttp/psr7": "^1.0",
     "php-http/discovery": "^1.13",
     "voryx/thruway-common": "^1.0.1",
     "react/dns": "^1.4",