Merge branch 'develop' into 9.5-2.2

README.md

@@ -82,6 +82,8 @@ To create a running container do:
 sudo docker run --name "postgis" -p 25432:5432 -d -t kartoza/postgis
 ```
 
+## Environment variables
+
 You can also use the following environment variables to pass a 
 user name and password. 
 
@@ -92,6 +94,12 @@ These will be used to create a new superuser with
 your preferred credentials. If these are not specified then the postgresql 
 user is set to 'docker' with password 'docker'.
 
+You can open up the PG port by using the following environment variable. By default 
+the container will allow connections only from the docker private subnet.
+
+* -e ALLOW_IP_RANGE=<0.0.0.0/0>
+
+
 ## Convenience run script
 
 For convenience we have provided a bash script for running this container

sshd.conf

@@ -1,5 +0,0 @@
-[program:sshd]
-user=root
-command=/usr/sbin/sshd -D
-autorestart=true
-stopsignal=INT

start-postgis.sh

@@ -63,6 +63,12 @@ if [ -z "$TOPOLOGY" ]; then
   TOPOLOGY=true
 fi  
 
+# Custom IP range via docker run -e (https://docs.docker.com/engine/reference/run/#env-environment-variables)
+# Usage is: docker run [...] -e ALLOW_IP_RANGE='192.168.0.0/16' 
+if [ "$ALLOW_IP_RANGE" ]
+then
+  echo "host    all             all             $ALLOW_IP_RANGE              md5" >> /etc/postgresql/9.5/main/pg_hba.conf
+fi
 
 # redirect user/pass into a file so we can echo it into
 # docker logs when container starts