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

Merge pull request #2813 from J-T-McC/master 

Added PHP 8 to libzip exclusion conditions
This commit is contained in:
Shao Yu-Lung (Allen) 2021-01-06 10:19:15 +08:00 committed by GitHub
parent cfdae5c6a2 d094cae2fb
commit e41be7eaf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel-horizon/Dockerfile
View File

@ -106,7 +106,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
RUN set -eux; \ RUN set -eux; \
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
apk --update add libzip-dev && \ apk --update add libzip-dev && \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \ if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
docker-php-ext-configure zip; \ docker-php-ext-configure zip; \
else \ else \
docker-php-ext-configure zip --with-libzip; \ docker-php-ext-configure zip --with-libzip; \

2
php-fpm/Dockerfile
View File

@ -51,7 +51,7 @@ 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 # 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 && \ libzip-dev zip unzip && \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \ if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
docker-php-ext-configure zip; \ docker-php-ext-configure zip; \
else \ else \
docker-php-ext-configure zip --with-libzip; \ docker-php-ext-configure zip --with-libzip; \

2
php-worker/Dockerfile
View File

@ -147,7 +147,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
RUN set -eux; \ RUN set -eux; \
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
apk --update add libzip-dev && \ apk --update add libzip-dev && \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \ if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
docker-php-ext-configure zip; \ docker-php-ext-configure zip; \
else \ else \
docker-php-ext-configure zip --with-libzip; \ docker-php-ext-configure zip --with-libzip; \