Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0d877
Replace relay-pkg.so with relay.so in dockerfiles
yatsukhnenko Aug 30, 2023
c207d05
Merge branch 'main' into issue-56
tillkruss Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions docker/debian/debian10-zts.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@ RUN curl --output php-${PHP}.tar.gz https://www.php.net/distributions/php-${PHP}

ARG RELAY=v0.6.8

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
16 changes: 12 additions & 4 deletions docker/debian/debian10.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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.8

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
13 changes: 12 additions & 1 deletion docker/litespeed.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,25 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp74/etc/php/7.4/mods-available/

ARG RELAY=v0.6.8

# 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"
Expand Down
13 changes: 12 additions & 1 deletion docker/openlitespeed.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,25 @@ ENV PHP_INI_DIR=/usr/local/lsws/lsphp81/etc/php/8.1/mods-available/

ARG RELAY=v0.6.8

# 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"
Expand Down
4 changes: 4 additions & 0 deletions docker/ubuntu/ubuntu20.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8

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);') \
Expand Down