ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POSTGIS Postgres Extension (#2110) 

* created PHP_FPM_INSTALL_POSTGIS variable
* install postgis if needs
* install_postgis variable
This commit is contained in:
Silvio Ney 2019-05-08 11:17:08 +01:00 committed by Shao Yu-Lung (Allen)
parent d8b3cb5a52
commit 0980523049
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -155,6 +155,7 @@ services:
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI} - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
- INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT} - INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT}
- INSTALL_POSTGIS=${PHP_FPM_INSTALL_POSTGIS}
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL} - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT} - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP} - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}

1
env-example
View File

@ -169,6 +169,7 @@ PHP_FPM_INSTALL_LDAP=false
PHP_FPM_INSTALL_PHALCON=false PHP_FPM_INSTALL_PHALCON=false
PHP_FPM_INSTALL_SWOOLE=false PHP_FPM_INSTALL_SWOOLE=false
PHP_FPM_INSTALL_PG_CLIENT=false PHP_FPM_INSTALL_PG_CLIENT=false
PHP_FPM_INSTALL_POSTGIS=false
PHP_FPM_INSTALL_PCNTL=false PHP_FPM_INSTALL_PCNTL=false
PHP_FPM_INSTALL_CALENDAR=false PHP_FPM_INSTALL_CALENDAR=false
PHP_FPM_INSTALL_FAKETIME=false PHP_FPM_INSTALL_FAKETIME=false

6
php-fpm/Dockerfile
View File

@ -128,13 +128,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
########################################################################### ###########################################################################
ARG INSTALL_PG_CLIENT=false ARG INSTALL_PG_CLIENT=false
ARG INSTALL_POSTGIS=false
RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Create folders if not exists (https://github.com/tianon/docker-brew-debian/issues/65) # Create folders if not exists (https://github.com/tianon/docker-brew-debian/issues/65)
mkdir -p /usr/share/man/man1 && \ mkdir -p /usr/share/man/man1 && \
mkdir -p /usr/share/man/man7 && \ mkdir -p /usr/share/man/man7 && \
# Install the pgsql client # Install the pgsql client
apt-get install -y postgresql-client \ apt-get install -y postgresql-client && \
if [ ${INSTALL_POSTGIS} = true ]; then \
apt-get install -y postgis; \
fi \
;fi ;fi
########################################################################### ###########################################################################