Skip to content

Commit 2d440b1

Browse files
Use specific PHP 7.4 versions of packages.
Otherwise our extra PHP installs will overwrite them.
1 parent d5d4fe2 commit 2d440b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker-contributor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt update \
2323
gcc g++ make zip unzip mariadb-client \
2424
nginx php7.4 php7.4-cli php7.4-fpm php7.4-zip \
2525
php7.4-gd php7.4-curl php7.4-mysql php7.4-json php7.4-intl \
26-
php7.4-gmp php7.4-xml php7.4-mbstring php-xdebug php-pcov \
26+
php7.4-gmp php7.4-xml php7.4-mbstring php7.4-xdebug php7.4-pcov \
2727
bsdmainutils ntp \
2828
linuxdoc-tools linuxdoc-tools-text groff \
2929
python3-sphinx python3-sphinx-rtd-theme python3-pip fontconfig python3-yaml \

docker-gitlabci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt update && apt install -y \
77
libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
88
gcc g++ default-jre-headless default-jdk ghc fp-compiler libcgroup-dev \
99
devscripts shellcheck nginx libboost-regex-dev \
10-
php php-cli php-gd php-curl php-mysql php-json php-gmp php-zip php-xml php-mbstring php-fpm php-intl php-pcov \
10+
php7.4 php7.4-cli php7.4-gd php7.4-curl php7.4-mysql php7.4-json php7.4-gmp php7.4-zip php7.4-xml php7.4-mbstring php7.4-fpm php7.4-intl php7.4-pcov \
1111
# W3c test \
1212
httrack \
1313
# Visual regression browser \

0 commit comments

Comments
 (0)