ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2461 from bestlong/php74-zip-option 

PHP 7.4 zip option removed
This commit is contained in:
Shao Yu-Lung (Allen) 2020-01-09 20:04:44 +08:00 committed by GitHub
parent 0d086024a8 ef267a64e6
commit 8a1b3c45c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
php-fpm/Dockerfile
View File

@ -51,7 +51,11 @@ RUN set -xe; \
#
# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
libzip-dev zip unzip && \
docker-php-ext-configure zip --with-libzip && \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
docker-php-ext-configure zip; \
else \
docker-php-ext-configure zip --with-libzip; \
fi && \
# Install the zip extension
docker-php-ext-install zip && \
php -m | grep -q 'zip'