From d094cae2fbacb74fe39ec1e02b310ad1dd62de0a Mon Sep 17 00:00:00 2001
From: J-T-McC <tyson_mcc@hotmail.com>
Date: Tue, 5 Jan 2021 17:47:32 -0800
Subject: [PATCH] Added PHP 8 to libzip exclusion conditions

---
 laravel-horizon/Dockerfile | 2 +-
 php-fpm/Dockerfile         | 2 +-
 php-worker/Dockerfile      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index 0e50f460..0066910f 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -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; \
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 4d1154e4..e4db8856 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -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; \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 084e2dd2..64f08298 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -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; \