Skip to content

Commit a4addd1

Browse files
yatsukhnenkoyatsukhnenko
committed
Replace relay-pkg.so with relay.so in dockerfiles
1 parent 4b2af7b commit a4addd1

File tree

6 files changed

+59
-10
lines changed

6 files changed

+59
-10
lines changed

‎docker/al2023.Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ RUN pecl install igbinary && \
1616

1717
ARG RELAY=v0.6.6
1818

19+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
20+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
21+
22+
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
23+
1924
RUN ARCH=$(uname -m | sed 's/_/-/') \
2025
PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
2126
ARTIFACT="https://builds.r2.relay.so/$RELAY/relay-$RELAY-php$PHP-el9-$ARCH.tar.gz" \
2227
&& curl -sfSL $ARTIFACT | tar xz --strip-components=1 -C /tmp
2328

2429
# Copy relay.{so,ini}
2530
RUN cp "/tmp/relay.ini" $(php-config --ini-dir)/50-relay.ini \
26-
&& cp "/tmp/relay-pkg.so" $(php-config --extension-dir)/relay.so
31+
&& cp "/tmp/relay.so" $(php-config --extension-dir)/relay.so
2732

2833
# Inject UUID
2934
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so

‎docker/debian/debian10-zts.Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,21 @@ RUN curl --output php-${PHP}.tar.gz https://www.php.net/distributions/php-${PHP}
2828

2929
ARG RELAY=v0.6.6
3030

31+
RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> '/etc/apt/sources.list'
32+
33+
RUN apt-get update && \
34+
apt-get install -y \
35+
libssl-dev \
36+
libck0
37+
38+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
39+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
40+
3141
# Download Relay
3242
RUN PHP=$(php -r "echo substr(PHP_VERSION, 0, 3);") \
3343
&& curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php$PHP-debian-x86-64%2Bzts.tar.gz" | tar xz -C /tmp \
3444
&& cd /tmp/relay-* \
35-
&& sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" relay-pkg.so \
45+
&& sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" relay.so \
3646
&& mkdir -p $(php-config --extension-dir) \
37-
&& cp relay-pkg.so $(php-config --extension-dir)/relay.so \
47+
&& cp relay.so $(php-config --extension-dir)/relay.so \
3848
&& cat relay.ini >> $(php-config --ini-path)/php.ini

‎docker/debian/debian10.Dockerfile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ RUN apt-get install -y \
88
apt-transport-https \
99
ca-certificates \
1010
software-properties-common \
11-
wget
11+
curl
1212

13-
RUN wget -q "https://packages.sury.org/php/apt.gpg" -O- | apt-key add -
13+
RUN curl "https://packages.sury.org/php/apt.gpg" | apt-key add -
1414
RUN add-apt-repository "deb https://packages.sury.org/php/ $(lsb_release -sc) main"
15+
RUN add-apt-repository "deb http://deb.debian.org/debian $(lsb_release -sc)-backports main"
1516
RUN apt-get update
1617

1718
# Fix `php-config` link to `sed`
@@ -20,23 +21,30 @@ RUN ln -s /bin/sed /usr/bin/sed
2021
RUN apt-get install -y \
2122
php8.1-dev
2223

24+
25+
2326
# Install Relay dependencies
2427
RUN apt-get install -y \
2528
lz4 \
2629
zstd \
30+
libssl-dev \
31+
libck0 \
2732
php8.1-msgpack \
2833
php8.1-igbinary
2934

3035
ARG RELAY=v0.6.6
3136

37+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
38+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
39+
3240
# Download Relay
3341
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
34-
&& wget -c "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM.tar.gz" -O - | tar xz -C /tmp
42+
&& curl "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM.tar.gz" | tar xz -C /tmp
3543

3644
# Copy relay.{so,ini}
3745
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
3846
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay.ini" $(php-config --ini-dir)/30-relay.ini \
39-
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay-pkg.so" $(php-config --extension-dir)/relay.so
47+
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM/relay.so" $(php-config --extension-dir)/relay.so
4048

4149
# Inject UUID
4250
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so

‎docker/litespeed.Dockerfile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,25 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp74/etc/php/7.4/mods-available/
66

77
ARG RELAY=v0.6.6
88

9+
# Install Relay dependencies
10+
RUN apt-get update \
11+
&& apt-get install -y \
12+
gcc \
13+
make \
14+
libssl-dev \
15+
libck0
16+
17+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
18+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
19+
920
# Download Relay
1021
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
1122
&& curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php7.4-debian-$PLATFORM.tar.gz" | tar xz -C /tmp
1223

1324
# Copy relay.{so,ini}
1425
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
1526
&& cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay.ini" "$PHP_INI_DIR/60-relay.ini" \
16-
&& cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
27+
&& cp "/tmp/relay-$RELAY-php7.4-debian-$PLATFORM/relay.so" "$PHP_EXT_DIR/relay.so"
1728

1829
# Inject UUID
1930
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXT_DIR/relay.so"

‎docker/openlitespeed.Dockerfile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,25 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp81/etc/php/8.1/mods-available/
66

77
ARG RELAY=v0.6.6
88

9+
# Install Relay dependencies
10+
RUN apt-get update \
11+
&& apt-get install -y \
12+
gcc \
13+
make \
14+
libssl-dev \
15+
libck0
16+
17+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
18+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
19+
920
# Download Relay
1021
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
1122
&& curl -L "https://builds.r2.relay.so/$RELAY/relay-$RELAY-php8.1-debian-$PLATFORM%2Blibssl3.tar.gz" | tar xz -C /tmp
1223

1324
# Copy relay.{so,ini}
1425
RUN PLATFORM=$(uname -m | sed 's/_/-/') \
1526
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay.ini" "$PHP_INI_DIR/60-relay.ini" \
16-
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay-pkg.so" "$PHP_EXT_DIR/relay.so"
27+
&& cp "/tmp/relay-$RELAY-php8.1-debian-$PLATFORM+libssl3/relay.so" "$PHP_EXT_DIR/relay.so"
1728

1829
# Inject UUID
1930
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXT_DIR/relay.so"

‎docker/ubuntu/ubuntu20.Dockerfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ RUN apt-get install -y \
1414

1515
# Install Relay dependencies
1616
RUN apt-get install -y \
17+
libck0 \
1718
php-msgpack \
1819
php-igbinary
1920

2021
ARG RELAY=v0.6.6
2122

23+
RUN curl -L https://github.com/redis/hiredis/archive/refs/tags/v1.2.0.tar.gz | tar -xzC /usr/src \
24+
&& PREFIX=/usr USE_SSL=1 make -C /usr/src/hiredis-1.2.0 install
25+
2226
# Download Relay
2327
RUN ARCH=$(uname -m | sed 's/_/-/') \
2428
PHP=$(php -r 'echo substr(PHP_VERSION, 0, 3);') \
@@ -27,7 +31,7 @@ RUN ARCH=$(uname -m | sed 's/_/-/') \
2731
# Copy relay.{so,ini}
2832
RUN ARCH=$(uname -m | sed 's/_/-/') \
2933
&& cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay.ini" $(php-config --ini-dir)/30-relay.ini \
30-
&& cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay-pkg.so" $(php-config --extension-dir)/relay.so
34+
&& cp "/tmp/relay-$RELAY-php7.4-debian-$ARCH/relay.so" $(php-config --extension-dir)/relay.so
3135

3236
# Inject UUID
3337
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so

0 commit comments

Comments
 (0)