blackbirdchess/blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vladyslavstartsev 2019-02-16 17:32:03 +02:00 committed by Shao Yu-Lung (Allen)
parent ee2db98c61
commit 1282c413fd
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -138,7 +138,6 @@ services:
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO} - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
- INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP} - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
- INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL} - INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
- INSTALL_ZIP_ARCHIVE=${PHP_FPM_INSTALL_ZIP_ARCHIVE}
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH} - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
- INSTALL_GMP=${PHP_FPM_INSTALL_GMP} - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS} - INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}

1
env-example
View File

@ -137,7 +137,6 @@ WORKSPACE_SSH_PORT=2222
### PHP_FPM ############################################### ### PHP_FPM ###############################################
PHP_FPM_INSTALL_ZIP_ARCHIVE=true
PHP_FPM_INSTALL_BCMATH=true PHP_FPM_INSTALL_BCMATH=true
PHP_FPM_INSTALL_MYSQLI=true PHP_FPM_INSTALL_MYSQLI=true
PHP_FPM_INSTALL_INTL=true PHP_FPM_INSTALL_INTL=true

23
php-fpm/Dockerfile
View File

@ -38,6 +38,14 @@ RUN apt-get update -yqq && \
# to add more Software's or remove existing one, you need to edit the # to add more Software's or remove existing one, you need to edit the
# base image (https://github.com/Laradock/php-fpm). # 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` # Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build. # in the `docker-compose.yml` before the build.
# Example: # Example:
# - INSTALL_ZIP_ARCHIVE=true # - INSTALL_SOAP=true
# #
########################################################################### ###########################################################################
@ -250,19 +258,6 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
docker-php-ext-install sockets \ docker-php-ext-install sockets \
;fi ;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 # pcntl
########################################################################### ###########################################################################

7
workspace/Dockerfile
View File

@ -53,6 +53,13 @@ RUN apt-get update -yqq && \
# to add more Software's or remove existing one, you need to edit the # to add more Software's or remove existing one, you need to edit the
# base image (https://github.com/Laradock/workspace). # 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 \
# #
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------