From db0d877933217d1c74c6c642ea99ae4fa98406ff Mon Sep 17 00:00:00 2001
From: Pavlo Yatsukhnenko <yatsukhnenko@gmail.com>
Date: Wed, 30 Aug 2023 13:36:14 +0300
Subject: [PATCH] Replace relay-pkg.so with relay.so in dockerfiles

---
 docker/debian/debian10-zts.Dockerfile | 14 ++++++++++++--
 docker/debian/debian10.Dockerfile     | 16 ++++++++++++----
 docker/litespeed.Dockerfile           | 13 ++++++++++++-
 docker/openlitespeed.Dockerfile       | 13 ++++++++++++-
 docker/ubuntu/ubuntu20.Dockerfile     |  6 +++++-
 5 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/docker/debian/debian10-zts.Dockerfile b/docker/debian/debian10-zts.Dockerfile
index 869129e..3ddb2af 100644
--- a/docker/debian/debian10-zts.Dockerfile
+++ b/docker/debian/debian10-zts.Dockerfile
@@ -28,11 +28,21 @@ RUN curl --output php-${PHP}.tar.gz https://www.php.net/distributions/php-${PHP}
 
 ARG RELAY=v0.6.6
 
+RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> '/etc/apt/sources.list'
+
+RUN apt-get update && \
+    apt-get install -y \
+    libssl-dev \
+    libck0
+
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
 # Download Relay
 RUN PHP=$(php -r "echo substr(PHP_VERSION, 0, 3);") \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php$PHP-debian-x86-64%2Bzts.tar.gz" | tar xz -C /tmp \
   && cd /tmp/relay-* \
-  && sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" relay-pkg.so \
+  && sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" relay.so \
   && mkdir -p $(php-config --extension-dir) \
-  && cp relay-pkg.so $(php-config --extension-dir)/relay.so \
+  && cp relay.so $(php-config --extension-dir)/relay.so \
   && cat relay.ini >> $(php-config --ini-path)/php.ini
diff --git a/docker/debian/debian10.Dockerfile b/docker/debian/debian10.Dockerfile
index c1c68a4..4305b30 100644
--- a/docker/debian/debian10.Dockerfile
+++ b/docker/debian/debian10.Dockerfile
@@ -8,10 +8,11 @@ RUN apt-get install -y \
   apt-transport-https \
   ca-certificates \
   software-properties-common \
-  wget
+  curl
 
-RUN wget -q "https://packages.sury.org/php/apt.gpg" -O- | apt-key add -
+RUN curl "https://packages.sury.org/php/apt.gpg" | apt-key add -
 RUN add-apt-repository "deb https://packages.sury.org/php/ $(lsb_release -sc) main"
+RUN add-apt-repository "deb http://deb.debian.org/debian $(lsb_release -sc)-backports main"
 RUN apt-get update
 
 # Fix `php-config` link to `sed`
@@ -20,23 +21,30 @@ RUN ln -s /bin/sed /usr/bin/sed
 RUN apt-get install -y \
   php8.1-dev
 
+
+
 # Install Relay dependencies
 RUN apt-get install -y \
   lz4 \
   zstd \
+  libssl-dev \
+  libck0 \
   php8.1-msgpack \
   php8.1-igbinary
 
 ARG RELAY=v0.6.6
 
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
-  && wget -c "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM.tar.gz" -O - | tar xz -C /tmp
+  && curl "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM.tar.gz" | tar xz -C /tmp
 
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay.ini" $(php-config --ini-dir)/30-relay.ini \
-  && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay-pkg.so" $(php-config --extension-dir)/relay.so
+  && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay.so" $(php-config --extension-dir)/relay.so
 
 # Inject UUID
 RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
diff --git a/docker/litespeed.Dockerfile b/docker/litespeed.Dockerfile
index cbe08ed..20ef992 100644
--- a/docker/litespeed.Dockerfile
+++ b/docker/litespeed.Dockerfile
@@ -6,6 +6,17 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp74/etc/php/7.4/mods-available/
 
 ARG RELAY=v0.6.6
 
+# Install Relay dependencies
+RUN apt-get update \
+  && apt-get install -y \
+  gcc \
+  make \
+  libssl-dev \
+  libck0
+
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php7.4-debian-$PLATFORM.tar.gz" | tar xz -C /tmp
@@ -13,7 +24,7 @@ RUN PLATFORM=$(uname -m | sed 's/_/-/') \
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay.ini" "$PHP_INI_DIR/60-relay.ini" \
-  && cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay.so" "$PHP_EXT_DIR/relay.so"
 
 # Inject UUID
 RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXT_DIR/relay.so"
diff --git a/docker/openlitespeed.Dockerfile b/docker/openlitespeed.Dockerfile
index 560db29..d3e8999 100644
--- a/docker/openlitespeed.Dockerfile
+++ b/docker/openlitespeed.Dockerfile
@@ -6,6 +6,17 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp81/etc/php/8.1/mods-available/
 
 ARG RELAY=v0.6.6
 
+# Install Relay dependencies
+RUN apt-get update \
+  && apt-get install -y \
+  gcc \
+  make \
+  libssl-dev \
+  libck0
+
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM%2Blibssl3.tar.gz" | tar xz -C /tmp
@@ -13,7 +24,7 @@ RUN PLATFORM=$(uname -m | sed 's/_/-/') \
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay.ini" "$PHP_INI_DIR/60-relay.ini" \
-  && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay.so" "$PHP_EXT_DIR/relay.so"
 
 # Inject UUID
 RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXT_DIR/relay.so"
diff --git a/docker/ubuntu/ubuntu20.Dockerfile b/docker/ubuntu/ubuntu20.Dockerfile
index 945a8fa..bb341e0 100644
--- a/docker/ubuntu/ubuntu20.Dockerfile
+++ b/docker/ubuntu/ubuntu20.Dockerfile
@@ -14,11 +14,15 @@ RUN apt-get install -y \
 
 # Install Relay dependencies
 RUN apt-get install -y \
+  libck0 \
   php-msgpack \
   php-igbinary
 
 ARG RELAY=v0.6.6
 
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
 # Download Relay
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
@@ -27,7 +31,7 @@ RUN ARCH=$(uname -m | sed 's/_/-/') \
 # Copy relay.{so,ini}
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay.ini" $(php-config --ini-dir)/30-relay.ini \
-  && cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay-pkg.so" $(php-config --extension-dir)/relay.so
+  && cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay.so" $(php-config --extension-dir)/relay.so
 
 # Inject UUID
 RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so