Skip to content

Commit d5d4fe2

Browse files
Also install pcov in CI image directly, since it uses the same config directory as the contributor image.
1 parent f029dbc commit d5d4fe2

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

docker-gitlabci/Dockerfile

Lines changed: 1 addition & 5 deletions
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 \
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 \
1111
# W3c test \
1212
httrack \
1313
# Visual regression browser \
@@ -27,7 +27,6 @@ RUN apt update && apt install -y \
2727
npm libnss3 libcups2 libxss1 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0 \
2828
# Code coverage for unit test
2929
php-pear php-dev \
30-
&& pecl install pcov \
3130
# Needed NPM packages \
3231
&& npm install pa11y \
3332
# Needed python packages \
@@ -54,9 +53,6 @@ RUN add-apt-repository ppa:ondrej/php -y && apt update && \
5453
done; \
5554
done && update-alternatives --set php /usr/bin/php7.4
5655

57-
# Enable pcov (code coverage) in PHP
58-
COPY php-config/30-pcov.ini /etc/php/7.4/cli/conf.d/
59-
6056
# Put the gitlab user in sudo
6157
RUN echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
6258

0 commit comments

Comments
 (0)