From 227f19062451c55a797e0cc667ef983834e6580c Mon Sep 17 00:00:00 2001 From: Matthias Mullie Date: Sun, 27 Dec 2020 22:20:48 +0100 Subject: [PATCH] Don't install libzip for more recent php versions --- .travis.yml | 5 +++++ Dockerfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a99049a1..218b08f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,3 +31,8 @@ after_success: after_script: - make down PHP=$(phpenv version-name) + +matrix: + allow_failures: + - php: 7.4 + - php: 8.0 diff --git a/Dockerfile b/Dockerfile index d17f9d74..fc36a814 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /var/www RUN apt-get update RUN apt-get install -y zip unzip zlib1g-dev -RUN docker-php-ext-install zip +RUN if [[ `php-config --vernum` -ge 73000 ]]; then docker-php-ext-install zip; fi RUN docker-php-ext-install pcntl RUN curl -sS https://getcomposer.org/installer | php RUN mv composer.phar /usr/local/bin/composer