Merge branch '9.5-2.2' into develop

Dockerfile

@@ -5,13 +5,9 @@ MAINTAINER Tim Sutton<tim@kartoza.com>
 RUN  export DEBIAN_FRONTEND=noninteractive
 ENV  DEBIAN_FRONTEND noninteractive
 RUN  dpkg-divert --local --rename --add /sbin/initctl
-#RUN  ln -s /bin/true /sbin/initctl
-
-# Use local cached debs from host (saves your bandwidth!)
-# Change ip below to that of your apt-cacher-ng host
-# Or comment this line out if you do not with to use caching
-ADD 71-apt-cacher-ng /etc/apt/apt.conf.d/71-apt-cacher-ng
 
+RUN apt-get -y update
+RUN apt-get -y install gnupg
 #RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
 # Add the PostgreSQL PGP key to verify their Debian packages.
 # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc
@@ -27,9 +23,7 @@ RUN apt-get -y install ca-certificates rpl pwgen
 # We add postgis as well to prevent build errors (that we dont see on local builds)
 # on docker hub e.g.
 # The following packages have unmet dependencies:
-# postgresql-9.3-postgis-2.1 : Depends: libgdal1h (>= 1.9.0) but it is not going to be installed
-#                              Recommends: postgis but it is not going to be installed
-RUN apt-get install -y postgresql-9.5-postgis-2.2 netcat
+RUN apt-get install -y postgresql-9.5-postgis-2.2 
 
 # Open port 5432 so linked containers can see them
 EXPOSE 5432

setup.sh

@@ -6,6 +6,7 @@ CONF="/etc/postgresql/9.5/main/postgresql.conf"
 
 # Restrict subnet to docker private network
 echo "host    all             all             172.17.0.0/16               md5" >> /etc/postgresql/9.5/main/pg_hba.conf
+echo "host    all             all             172.18.0.0/16               md5" >> /etc/postgresql/9.5/main/pg_hba.conf
 # And allow access from DockerToolbox / Boottodocker on OSX
 echo "host    all             all             192.168.0.0/16               md5" >> /etc/postgresql/9.5/main/pg_hba.conf
 # Listen on all ip addresses