Skip to content

Commit 1282c41

Browse files
vv12131415bestlong
authored andcommitted
added zip to php-fpm workspace container (so there is no composer warning) (laradock#1903)
1 parent ee2db98 commit 1282c41

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ services:
138138
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
139139
- INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
140140
- INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
141-
- INSTALL_ZIP_ARCHIVE=${PHP_FPM_INSTALL_ZIP_ARCHIVE}
142141
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
143142
- INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
144143
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}

env-example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ WORKSPACE_SSH_PORT=2222
137137

138138
### PHP_FPM ###############################################
139139

140-
PHP_FPM_INSTALL_ZIP_ARCHIVE=true
141140
PHP_FPM_INSTALL_BCMATH=true
142141
PHP_FPM_INSTALL_MYSQLI=true
143142
PHP_FPM_INSTALL_INTL=true

php-fpm/Dockerfile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ RUN apt-get update -yqq && \
3838
# to add more Software's or remove existing one, you need to edit the
3939
# base image (https://github.com/Laradock/php-fpm).
4040
#
41+
# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
42+
USER root
43+
44+
RUN apt-get install libzip-dev zip unzip -y && \
45+
docker-php-ext-configure zip --with-libzip && \
46+
# Install the zip extension
47+
docker-php-ext-install zip \
48+
4149

4250
#
4351
#--------------------------------------------------------------------------
@@ -47,7 +55,7 @@ RUN apt-get update -yqq && \
4755
# Optional Software's will only be installed if you set them to `true`
4856
# in the `docker-compose.yml` before the build.
4957
# Example:
50-
# - INSTALL_ZIP_ARCHIVE=true
58+
# - INSTALL_SOAP=true
5159
#
5260

5361
###########################################################################
@@ -250,19 +258,6 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
250258
docker-php-ext-install sockets \
251259
;fi
252260

253-
###########################################################################
254-
# ZipArchive:
255-
###########################################################################
256-
257-
ARG INSTALL_ZIP_ARCHIVE=false
258-
259-
RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
260-
apt-get install libzip-dev -y && \
261-
docker-php-ext-configure zip --with-libzip && \
262-
# Install the zip extension
263-
docker-php-ext-install zip \
264-
;fi
265-
266261
###########################################################################
267262
# pcntl
268263
###########################################################################

workspace/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ RUN apt-get update -yqq && \
5353
# to add more Software's or remove existing one, you need to edit the
5454
# base image (https://github.com/Laradock/workspace).
5555
#
56+
# next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846
57+
USER root
58+
59+
RUN apt-get install libzip-dev zip unzip -y && \
60+
docker-php-ext-configure zip --with-libzip && \
61+
# Install the zip extension
62+
docker-php-ext-install zip \
5663

5764
#
5865
#--------------------------------------------------------------------------

0 commit comments

Comments
 (0)