9.5 2.2 (#49)

* Allow connections from 192.168 private network too

* Updated references to pg and postgis versions in readme

* Cleanups to 9.5 branch - remove old supervisor files

* Fix for README

README.md

@@ -139,7 +139,7 @@ You can then go on to use any normal postgresql commands against the container.
 Under ubuntu 14.04 the postgresql client can be installed like this:
 
 ```
-sudo apt-get install postgresql-client-9.3
+sudo apt-get install postgresql-client-9.5
 ```
 
 

build.sh

@@ -1 +1 @@
-docker build -t kartoza/postgis .
+docker build -t kartoza/postgis:9.5-2.2 .

postgres.conf

@@ -1,5 +0,0 @@
-[program:postgres]
-user=root
-command=/start-postgis.sh
-autorestart=true
-stopsignal=INT

setup.sh

@@ -6,6 +6,8 @@ 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
+# And allow access from DockerToolbox / Boottodocker on OSX
+echo "host    all             all             192.168.0.0/16               md5" >> /etc/postgresql/9.4/main/pg_hba.conf
 # Listen on all ip addresses
 echo "listen_addresses = '*'" >> /etc/postgresql/9.5/main/postgresql.conf
 echo "port = 5432" >> /etc/postgresql/9.5/main/postgresql.conf
@@ -14,8 +16,8 @@ echo "port = 5432" >> /etc/postgresql/9.5/main/postgresql.conf
 
 echo "ssl = true" >> $CONF
 #echo "ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH' " >> $CONF
-#echo "ssl_renegotiation_limit = 512MB "  >> $CONF 
-echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $CONF 
-echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $CONF 
-#echo "ssl_ca_file = ''                       # (change requires restart)" >> $CONF 
-#echo "ssl_crl_file = ''" >> $CONF 
+#echo "ssl_renegotiation_limit = 512MB "  >> $CONF
+echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $CONF
+echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $CONF
+#echo "ssl_ca_file = ''                       # (change requires restart)" >> $CONF
+#echo "ssl_crl_file = ''" >> $CONF

sshd.conf

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