Skip to content

Commit d094cae

Browse files
committed
Added PHP 8 to libzip exclusion conditions
1 parent cfdae5c commit d094cae

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

laravel-horizon/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
106106
RUN set -eux; \
107107
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
108108
apk --update add libzip-dev && \
109-
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
109+
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
110110
docker-php-ext-configure zip; \
111111
else \
112112
docker-php-ext-configure zip --with-libzip; \

php-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -xe; \
5151
#
5252
# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
5353
libzip-dev zip unzip && \
54-
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
54+
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
5555
docker-php-ext-configure zip; \
5656
else \
5757
docker-php-ext-configure zip --with-libzip; \

php-worker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ ARG INSTALL_ZIP_ARCHIVE=false
147147
RUN set -eux; \
148148
if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
149149
apk --update add libzip-dev && \
150-
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
150+
if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
151151
docker-php-ext-configure zip; \
152152
else \
153153
docker-php-ext-configure zip --with-libzip; \

0 commit comments

Comments
 (0)