From 1282c413fdadcab69a1ad1b9a8c6bed40ac8bf41 Mon Sep 17 00:00:00 2001
From: vladyslavstartsev <vladronaldo7@gmail.com>
Date: Sat, 16 Feb 2019 17:32:03 +0200
Subject: [PATCH] added zip to php-fpm workspace container (so there is no
 composer warning) (#1903)

---
 docker-compose.yml   |  1 -
 env-example          |  1 -
 php-fpm/Dockerfile   | 23 +++++++++--------------
 workspace/Dockerfile |  7 +++++++
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e9fb4c53..25cc19ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -138,7 +138,6 @@ services:
           - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
           - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
           - INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
-          - INSTALL_ZIP_ARCHIVE=${PHP_FPM_INSTALL_ZIP_ARCHIVE}
           - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
           - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
           - INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
diff --git a/env-example b/env-example
index f8691378..bf45663e 100644
--- a/env-example
+++ b/env-example
@@ -137,7 +137,6 @@ WORKSPACE_SSH_PORT=2222
 
 ### PHP_FPM ###############################################
 
-PHP_FPM_INSTALL_ZIP_ARCHIVE=true
 PHP_FPM_INSTALL_BCMATH=true
 PHP_FPM_INSTALL_MYSQLI=true
 PHP_FPM_INSTALL_INTL=true
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 87b7d3a9..74804c07 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -38,6 +38,14 @@ RUN apt-get update -yqq && \
 # to add more Software's or remove existing one, you need to edit the
 # base image (https://github.com/Laradock/php-fpm).
 #
+# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
+USER root
+
+RUN apt-get install libzip-dev zip unzip -y && \
+    docker-php-ext-configure zip --with-libzip && \
+    # Install the zip extension
+    docker-php-ext-install zip \
+
 
 #
 #--------------------------------------------------------------------------
@@ -47,7 +55,7 @@ RUN apt-get update -yqq && \
 # Optional Software's will only be installed if you set them to `true`
 # in the `docker-compose.yml` before the build.
 # Example:
-#   - INSTALL_ZIP_ARCHIVE=true
+#   - INSTALL_SOAP=true
 #
 
 ###########################################################################
@@ -250,19 +258,6 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
     docker-php-ext-install sockets \
 ;fi
 
-###########################################################################
-# ZipArchive:
-###########################################################################
-
-ARG INSTALL_ZIP_ARCHIVE=false
-
-RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
-    apt-get install libzip-dev -y && \
-    docker-php-ext-configure zip --with-libzip && \
-    # Install the zip extension
-    docker-php-ext-install zip \
-;fi
-
 ###########################################################################
 # pcntl
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d465493b..2d9ee448 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -53,6 +53,13 @@ RUN apt-get update -yqq && \
 # to add more Software's or remove existing one, you need to edit the
 # base image (https://github.com/Laradock/workspace).
 #
+# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
+USER root
+
+RUN apt-get install libzip-dev zip unzip -y && \
+    docker-php-ext-configure zip --with-libzip && \
+    # Install the zip extension
+    docker-php-ext-install zip \
 
 #
 #--------------------------------------------------------------------------