Added PHP 8 to libzip exclusion conditions
This commit is contained in:
parent
cfdae5c6a2
commit
d094cae2fb
@ -106,7 +106,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
|
||||
RUN set -eux; \
|
||||
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
|
||||
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; \
|
||||
else \
|
||||
docker-php-ext-configure zip --with-libzip; \
|
||||
|
@ -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
|
||||
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; \
|
||||
else \
|
||||
docker-php-ext-configure zip --with-libzip; \
|
||||
|
@ -147,7 +147,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
|
||||
RUN set -eux; \
|
||||
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
|
||||
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; \
|
||||
else \
|
||||
docker-php-ext-configure zip --with-libzip; \
|
||||
|
Loading…
Reference in New Issue
Block a user