From 571e1922fe37c7f1c8b414393c1523091088ab05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Thu, 4 Mar 2021 14:17:53 +0100
Subject: [PATCH] =?UTF-8?q?ci:=20utilise=20la=20m=C3=AAme=20image=20que=20?=
 =?UTF-8?q?les=20paquets=20qu'importe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a5ba6..71504ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,20 +15,12 @@ test:
           - "7.3"
           - "7.4"
           - "8.0"
-  image: php:${PHP_VERSION}-cli
-  rules:
-    - if: $PHP_VERSION == "8.0-rc"
-      allow_failure: true
-    - when: always
+  image: gitlab-registry.irstea.fr/pole-is/docker/php:buster-${PHP_VERSION}-4.0.0
   before_script:
     - |
       echo -e "section_start:`date +%s`:setup[collapsed=true]\r\e[0KInstall dependencies"
       apt-get update -yqq
-      apt-get install -yqq unzip git
-      if [[ $PHP_VERSION != "8.0-rc" ]]; then
-        pecl install pcov
-        docker-php-ext-enable pcov
-      fi
+      apt-get install -yqq unzip git php${PHP_VERSION}-pcov
       curl -sSL "https://getcomposer.org/composer-${COMPOSER_MAJOR}.phar" -o /tmp/composer
       echo -en "section_end:`date +%s`:setup\r\e[0K"
     - php -v
-- 
GitLab