Merge branch 'adding-postgis' of https://github.com/lwiechec/docker-postgresql into lwiechec-adding-postgis

Author: Sameer Naik

Dockerfile

@@ -7,7 +7,8 @@ ENV PG_APP_HOME="/etc/docker-postgresql"\
     PG_HOME=/var/lib/postgresql \
     PG_RUNDIR=/run/postgresql \
     PG_LOGDIR=/var/log/postgresql \
-    PG_CERTDIR=/etc/postgresql/certs
+    PG_CERTDIR=/etc/postgresql/certs \
+    PG_POSTGIS_VERSION=2.1
 
 ENV PG_BINDIR=/usr/lib/postgresql/${PG_VERSION}/bin \
     PG_DATADIR=${PG_HOME}/${PG_VERSION}/main
@@ -17,6 +18,7 @@ RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-k
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y acl \
       postgresql-${PG_VERSION} postgresql-client-${PG_VERSION} postgresql-contrib-${PG_VERSION} \
+      postgresql-${PG_VERSION}-postgis-${PG_POSTGIS_VERSION} postgresql-${PG_VERSION}-postgis-${PG_POSTGIS_VERSION}-scripts \
  && ln -sf ${PG_DATADIR}/postgresql.conf /etc/postgresql/${PG_VERSION}/main/postgresql.conf \
  && ln -sf ${PG_DATADIR}/pg_hba.conf /etc/postgresql/${PG_VERSION}/main/pg_hba.conf \
  && ln -sf ${PG_DATADIR}/pg_ident.conf /etc/postgresql/${PG_VERSION}/main/pg_ident.conf \

README.md

@@ -14,6 +14,7 @@
   - [Creating database user](#creating-database-user)
   - [Creating databases](#creating-databases)
   - [Enabling unaccent extension](#enabling-unaccent-extension)
+  - [Enabling PostGIS extension](#enabling-postgis-extension)
   - [Granting user access to a database](#granting-user-access-to-a-database)
   - [Creating replication user](#creating-replication-user)
   - [Setting up a replication cluster](#setting-up-a-replication-cluster)
@@ -182,9 +183,21 @@ docker run --name postgresql -itd \
   --env 'DB_NAME=dbname' --env 'DB_UNACCENT=true' \
   sameersbn/postgresql:9.4-11
 ```
-
 *By default the unaccent extension is disabled*
 
+# Enabling PostGIS extension
+
+PostGIS is spatial extension to PostgreSQL.
+
+You can enable the PostGIS extension on database(s) by specifying `DB_POSTGIS=true`. For example, the following command enables the unaccent extension for the `dbname` database.
+
+```bash
+docker run --name postgresql -itd \
+  --env 'DB_NAME=dbname' --env 'DB_POSTGIS=true' \
+  sameersbn/postgresql:9.4-11
+```
+*By default the PostGIS extension is disabled*
+
 ## Granting user access to a database
 
 If the `DB_USER` and `DB_PASS` variables are specified along with the `DB_NAME` variable, then the user specified in `DB_USER` will be granted access to all the databases listed in `DB_NAME`. Note that if the user and/or databases do not exist, they will be created.

VERSION

@@ -1 +1 @@
-9.4-11
+9.4-12-snapshot

runtime/env-defaults

@@ -19,3 +19,7 @@ DB_PASS=${DB_PASS:-}
 DB_TEMPLATE=${DB_TEMPLATE:-template1}
 
 DB_UNACCENT=${DB_UNACCENT:-false}
+
+DB_POSTGIS=${DB_POSTGIS:-false}
+DB_POSTGIS_HSTORE=${DB_POSTGIS_HSTORE:-true}
+DB_POSTGIS_TOPOLOGY=${DB_POSTGIS_TOPOLOGY:-true}

runtime/functions

@@ -323,6 +323,11 @@ create_database() {
             psql -U ${PG_USER} -d ${database} -c "CREATE EXTENSION IF NOT EXISTS unaccent;" >/dev/null 2>&1
           fi
 
+          if [[ ${DB_POSTGIS} == true ]]; then
+            psql -U ${PG_USER} -d ${database} -c "CREATE EXTENSION IF NOT EXISTS postgis;" >/dev/null 2>&1
+            psql -U ${PG_USER} -d ${database} -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;" >/dev/null 2>&1
+          fi
+
           if [[ -n ${DB_USER} ]]; then
             psql -U ${PG_USER} -c "GRANT ALL PRIVILEGES ON DATABASE \"${database}\" to \"${DB_USER}\";" >/dev/null
           fi