Skip to content

Commit

Permalink
Don't install libzip for more recent php versions
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasmullie committed Dec 27, 2020
1 parent 6da68a1 commit 227f190
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ after_success:

after_script:
- make down PHP=$(phpenv version-name)

matrix:
allow_failures:
- php: 7.4
- php: 8.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 227f190

Please sign in to comment.