Pārlūkot izejas kodu

added zip to php-fpm workspace container (so there is no composer warning) (#1903)

vladyslavstartsev 6 gadi atpakaļ
vecāks
revīzija
1282c413fd
4 mainītis faili ar 16 papildinājumiem un 16 dzēšanām
  1. 0 1
      docker-compose.yml
  2. 0 1
      env-example
  3. 9 14
      php-fpm/Dockerfile
  4. 7 0
      workspace/Dockerfile

+ 0 - 1
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}

+ 0 - 1
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

+ 9 - 14
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
 ###########################################################################

+ 7 - 0
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 \
 
 #
 #--------------------------------------------------------------------------