Replace relay-pkg.so with relay.so in dockerfiles

Author: yatsukhnenko

docker/al2.Dockerfile

@@ -15,6 +15,7 @@ RUN yum install -y \
   php-pear \
   php-devel \
   openssl11 \
+  openssl-devel \
   libzstd-devel
 
 RUN pecl config-set php_ini /etc/php.ini
@@ -29,6 +30,11 @@ RUN pecl install 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
+
+RUN yum install -y https://kojipkgs.fedoraproject.org/packages/ck/0.5.2/2.el7/x86_64/ck-0.5.2-2.el7.x86_64.rpm
+
 # Download Relay
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
@@ -37,7 +43,7 @@ RUN ARCH=$(uname -m | sed 's/_/-/') \
 # Copy relay.{so,ini}
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.0-centos7-$ARCH/relay.ini" $(php-config --ini-dir)/50-relay.ini \
-  && cp "/tmp/relay-$RELAY-php8.0-centos7-$ARCH/relay-pkg.so" $(php-config --extension-dir)/relay.so
+  && cp "/tmp/relay-$RELAY-php8.0-centos7-$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

docker/al2023.Dockerfile

@@ -16,14 +16,19 @@ RUN pecl install 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
+
+RUN dnf install -y https://kojipkgs.fedoraproject.org/packages/ck/0.7.0/10.el9/x86_64/ck-0.7.0-10.el9.x86_64.rpm
+
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
   ARTIFACT="https://builds.r2.relay.so/$RELAY/relay-$RELAY-php$PHP-el9-$ARCH.tar.gz" \
   && curl -sfSL $ARTIFACT | tar xz --strip-components=1 -C /tmp
 
 # Copy relay.{so,ini}
 RUN cp "/tmp/relay.ini" $(php-config --ini-dir)/50-relay.ini \
-  && cp "/tmp/relay-pkg.so" $(php-config --extension-dir)/relay.so
+  && cp "/tmp/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

docker/centos7/centos7.Dockerfile

@@ -20,21 +20,31 @@ ARG RELAY=v0.6.6
 
 # Install Relay dependencies
 RUN yum install -y \
-  openssl11 libzstd lz4
+  gcc \
+  make \
+  openssl11 \
+  openssl-devel \
+  libzstd \
+  lz4
 
 # Relay requires the `msgpack` and `igbinary` extension
 RUN yum install -y \
   php80-php-igbinary \
   php80-php-msgpack
 
+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
+
+RUN yum install -y https://kojipkgs.fedoraproject.org/packages/ck/0.5.2/2.el7/x86_64/ck-0.5.2-2.el7.x86_64.rpm
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.0-centos7-$PLATFORM.tar.gz" | tar xz -C /tmp
 
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.0-centos7-$PLATFORM/relay.ini" "$PHP_INI_DIR/50-relay.ini" \
-  && cp "/tmp/relay-$RELAY-php8.0-centos7-$PLATFORM/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay-$RELAY-php8.0-centos7-$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"

docker/centos8/centos8.Dockerfile

@@ -20,19 +20,33 @@ ENV PHP_EXT_DIR=/opt/remi/php80/root/usr/lib64/php/modules/
 
 ARG RELAY=v0.6.6
 
+# Install Relay dependencies
+RUN yum install -y \
+  gcc \
+  make \
+  openssl \
+  openssl-devel \
+  libzstd \
+  lz4
+
 # Relay requires the `msgpack` and `igbinary` extension
 RUN yum install -y \
   php80-php-igbinary \
   php80-php-msgpack
 
+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
+
+RUN dnf install -y https://kojipkgs.fedoraproject.org/packages/ck/0.6.0/9.el8/x86_64/ck-0.6.0-9.el8.x86_64.rpm
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.0-centos8-$PLATFORM.tar.gz" | tar xz -C /tmp
 
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.0-centos8-$PLATFORM/relay.ini" "$PHP_INI_DIR/50-relay.ini" \
-  && cp "/tmp/relay-$RELAY-php8.0-centos8-$PLATFORM/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay-$RELAY-php8.0-centos8-$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"

docker/centos8/rocky8.Dockerfile

@@ -17,19 +17,33 @@ ENV PHP_EXT_DIR=/opt/remi/php80/root/usr/lib64/php/modules/
 
 ARG RELAY=v0.6.6
 
+# Install Relay dependencies
+RUN yum install -y \
+  gcc \
+  make \
+  openssl \
+  openssl-devel \
+  libzstd \
+  lz4
+
 # Relay requires the `msgpack` and `igbinary` extension
 RUN yum install -y \
   php80-php-igbinary \
   php80-php-msgpack
 
+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
+
+RUN dnf install -y https://kojipkgs.fedoraproject.org/packages/ck/0.6.0/9.el8/x86_64/ck-0.6.0-9.el8.x86_64.rpm
+
 # Download Relay
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.0-centos8-$PLATFORM.tar.gz" | tar xz -C /tmp
 
 # Copy relay.{so,ini}
 RUN PLATFORM=$(uname -m | sed 's/_/-/') \
   && cp "/tmp/relay-$RELAY-php8.0-centos8-$PLATFORM/relay.ini" "$PHP_INI_DIR/50-relay.ini" \
-  && cp "/tmp/relay-$RELAY-php8.0-centos8-$PLATFORM/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay-$RELAY-php8.0-centos8-$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"

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

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

docker/el9/el9.Dockerfile

@@ -17,11 +17,25 @@ ENV PHP_EXT_DIR=/usr/lib64/php/modules
 
 ARG RELAY=v0.6.6
 
+# Install Relay dependencies
+RUN dnf install -y \
+  gcc \
+  make \
+  openssl \
+  openssl-devel \
+  libzstd \
+  lz4
+
 # Relay requires the `msgpack` and `igbinary` extension
 RUN dnf -y install \
   php-msgpack \
   php-igbinary
 
+RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
+  && USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
+
+RUN dnf install -y https://kojipkgs.fedoraproject.org//packages/ck/0.7.0/10.el9/x86_64/ck-0.7.0-10.el9.x86_64.rpm
+
 # Download Relay
 RUN ARCH=$(uname -m | sed 's/_/-/') \
   PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
@@ -30,7 +44,7 @@ RUN ARCH=$(uname -m | sed 's/_/-/') \
 
 # Copy relay.{so,ini}
 RUN cp "/tmp/relay.ini" "$PHP_INI_DIR/50-relay.ini" \
-  && cp "/tmp/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
+  && cp "/tmp/relay.so" "$PHP_EXT_DIR/relay.so"
 
 # Inject UUID
 RUN UUID=$(cat /proc/sys/kernel/random/uuid) \

docker/litespeed.Dockerfile

@@ -6,14 +6,25 @@ 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
 
 # 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"

docker/openlitespeed.Dockerfile

@@ -6,14 +6,25 @@ 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
 
 # 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"