Skip to content

Commit 7d01a1d

Browse files
Upgrade PHP builder - part of upgrading the container to ubuntu 2204
- fixed runtime deps for mariadb in ubuntu 22.04 container - fixed build-time deps for php in 22.04 container PHP 7.1 won't compile on 22.04 container but it's EOL anyway. - updated the list with only supported versions. See: https://www.php.net/supported-versions
1 parent c4ca50e commit 7d01a1d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dockerfiles/eco-php-ubuntu-2204.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ LABEL maintainer="MariaDB Buildbot maintainers"
1010
ARG DEBIAN_FRONTEND=noninteractive
1111

1212
# libaio1, snappy/numa is for the mariadb tarball
13-
# libreadline5 for mariadb client
13+
# libedit2 liburing2 for mariadb client
1414
# curl, git used in intialization, rest are
1515
# for php.
1616
RUN apt-get update -y && \
1717
apt-get install -y \
1818
libaio1 \
1919
liblzo2-2 liblzma5 libbz2-1.0 \
20-
libsnappy1v5 libnuma1 libreadline5 libpmem1 \
20+
libsnappy1v5 libnuma1 libedit2 liburing2 libpmem1 \
2121
python3 python3-pip \
2222
curl \
2323
language-pack-de \
2424
libgmp-dev \
2525
libicu-dev \
2626
libtidy-dev \
27-
libenchant-dev \
28-
libaspell-dev \
27+
#https://github.com/oerdnj/deb.sury.org/issues/1542
28+
libenchant-2-dev \
2929
libpspell-dev \
3030
librecode-dev \
3131
libsasl2-dev \

master-docker-nonstandard/master.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -899,17 +899,17 @@ f_eco_php.addStep(
899899
)
900900
f_eco_php.addStep(
901901
steps.ShellCommand(
902-
name="test PHP-7.1", command=["sh", "-xc", "/buildbot/test-php.sh PHP-7.1"]
902+
name="test PHP-8.1", command=["sh", "-xc", "/buildbot/test-php.sh PHP-8.1"]
903903
)
904904
)
905905
f_eco_php.addStep(
906906
steps.ShellCommand(
907-
name="test PHP-8.0", command=["sh", "-xc", "/buildbot/test-php.sh PHP-8.0"]
907+
name="test PHP-8.2", command=["sh", "-xc", "/buildbot/test-php.sh PHP-8.2"]
908908
)
909909
)
910910
f_eco_php.addStep(
911911
steps.ShellCommand(
912-
name="test PHP-8.1", command=["sh", "-xc", "/buildbot/test-php.sh PHP-8.1"]
912+
name="test PHP-8.3", command=["sh", "-xc", "/buildbot/test-php.sh PHP-8.3"]
913913
)
914914
)
915915
f_eco_php.addStep(

0 commit comments

Comments
 (0)