Skip to content

Commit 7f5e618

Browse files
michael-grunderszepeviktortillkruss
authored
Fix EOL builds. (#143)
* centOS 7 is dead, use 'vault' mirror * Fix libck as well * Drop debian 10 and migrate example to debian 11. * Update docker/centos7/centos7.Dockerfile Co-authored-by: Viktor Szépe <viktor@szepe.net> * Fix reference to debian 10 * Update docker/centos7/centos7.Dockerfile Use `php --ri relay` not `php -m |grep relay` Co-authored-by: Viktor Szépe <viktor@szepe.net> * formatting --------- Co-authored-by: Viktor Szépe <viktor@szepe.net> Co-authored-by: Till Krüss <tillkruss@users.noreply.github.com>
1 parent 07eed7d commit 7f5e618

File tree

6 files changed

+29
-5
lines changed

6 files changed

+29
-5
lines changed

.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- centos8/centos8
3232
- centos8/rocky8
3333
- el9/el9
34-
- debian/debian10
34+
- debian/debian11
3535
- ubuntu/ubuntu20
3636
- mint21
3737
- litespeed

docker/centos7/centos7-yum-single.Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
FROM --platform=linux/amd64 centos:7
22

3+
# It's dead, Jim
4+
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
5+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
6+
7+
RUN yum update -y
8+
39
RUN yum install -y "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
410
RUN yum install -y "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
511
RUN yum install -y yum-utils

docker/centos7/centos7-yum.Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
FROM --platform=linux/amd64 centos:7
22

3+
# It's dead, Jim
4+
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
5+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
6+
7+
RUN yum update -y
8+
39
RUN yum install -y "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
410

511
RUN yum install -y \

docker/centos7/centos7.Dockerfile

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
FROM --platform=linux/amd64 centos:7
22

3+
# It's dead, Jim
4+
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
5+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
6+
7+
RUN yum -y update
8+
39
RUN yum install -y "https://rpms.remirepo.net/enterprise/remi-release-7.rpm"
410

511
RUN yum-config-manager --disable 'remi-php*' \
@@ -21,8 +27,8 @@ RUN yum install -y \
2127
openssl11 \
2228
libzstd \
2329
lz4 \
24-
https://download.opensuse.org/distribution/leap/15.5/repo/oss/x86_64/libck0-0.7.1-bp155.2.11.x86_64.rpm \
25-
https://download.opensuse.org/distribution/leap/15.5/repo/oss/x86_64/libhiredis1_1_0-1.1.0-bp155.1.6.x86_64.rpm
30+
https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libck0-0.7.1-bp155.2.11.x86_64.rpm \
31+
https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libhiredis1_1_0-1.1.0-bp155.1.6.x86_64.rpm
2632

2733
# Relay requires the `msgpack` and `igbinary` extension
2834
RUN yum install -y \
@@ -40,3 +46,6 @@ RUN PLATFORM=$(uname -m | sed 's/_/-/') \
4046

4147
# Inject UUID
4248
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXT_DIR/relay.so"
49+
50+
# Ensure relay was installed properly.
51+
RUN php --ri relay

docker/debian/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ php --ri relay
1515
## Debian (manual)
1616

1717
```bash
18-
docker build --pull --tag relay-debian --file debian10.Dockerfile .
18+
docker build --pull --tag relay-debian --file debian11.Dockerfile .
1919
docker run -it relay-debian bash
2020
$ php --ri relay
2121
```

docker/debian/debian10.Dockerfile renamed to docker/debian/debian11.Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:10.10
1+
FROM debian:11
22

33
RUN apt-get update
44

@@ -40,3 +40,6 @@ RUN PLATFORM=$(uname -m | sed 's/_/-/') \
4040

4141
# Inject UUID
4242
RUN sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
43+
44+
# Ensure Relay is correctly installed
45+
RUN php --ri relay

0 commit comments

Comments
 (0)