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

PHP 7.4 zip option removed
2020-01-09 20:04:44 +08:00 · 2020-01-06 23:39:23 +08:00 · 2020-01-05 01:07:21 +08:00 · 2020-01-03 20:07:42 +08:00
2 changed files with 6 additions and 2 deletions
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@ -1,4 +1,4 @@
-FROM webdevops/apache:ubuntu-16.04
+FROM webdevops/apache:ubuntu-18.04
 LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"
--- 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'
Author	SHA1	Message	Date
Shao Yu-Lung (Allen)	8a1b3c45c8	Merge pull request #2461 from bestlong/php74-zip-option PHP 7.4 zip option removed	2020-01-09 20:04:44 +08:00
Shao Yu Lung	ef267a64e6	PHP 7.4 zip option removed	2020-01-06 23:39:23 +08:00
Shao Yu-Lung (Allen)	0d086024a8	Merge pull request #2457 from laradock/upgrade-apache2 upgrade apache2	2020-01-05 01:07:21 +08:00
Shao Yu Lung	92e7a8559d	upgrade apache2	2020-01-03 20:07:42 +08:00
`@ -1,4 +1,4 @@`
	`FROM webdevops/apache:ubuntu-16.04`	`FROM webdevops/apache:ubuntu-18.04`

	`LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"`	`LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"`