Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Arkadius Jonczek 2017-10-19 14:31:02 +02:00
commit b8e657b68f
4 changed files with 20 additions and 1 deletions

View File

@ -76,6 +76,7 @@ PHP_FPM_INSTALL_OPCACHE=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_POSTGRES=false
PHP_FPM_INSTALL_TOKENIZER=false
PHP_FPM_INSTALL_INTL=false
PHP_FPM_INSTALL_GHOSTSCRIPT=false

View File

@ -1,4 +1,4 @@
FROM node:argon
FROM node:alpine
# Create app directory
RUN mkdir -p /usr/src/app

View File

@ -207,6 +207,15 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \
docker-php-ext-install mysqli \
;fi
#####################################
# postgres Modifications:
#####################################
ARG INSTALL_POSTGRES=false
RUN if [ ${INSTALL_POSTGRES} = true ]; then \
docker-php-ext-install pgsql \
;fi
#####################################
# Tokenizer Modifications:
#####################################

View File

@ -216,6 +216,15 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \
docker-php-ext-install mysqli \
;fi
#####################################
# postgres Modifications:
#####################################
ARG INSTALL_POSTGRES=false
RUN if [ ${INSTALL_POSTGRES} = true ]; then \
docker-php-ext-install pgsql \
;fi
#####################################
# Tokenizer Modifications:
#####################################