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

PHP 7.4 zip option removed
lukasbesch · Jan 9, 2020 · 8a1b3c4 · 8a1b3c4
2 parents 0d08602 + ef267a6
commit 8a1b3c4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -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'