diff --git a/71-apt-cacher-ng b/71-apt-cacher-ng index 32a06d4..c2b91ac 100644 --- a/71-apt-cacher-ng +++ b/71-apt-cacher-ng @@ -3,5 +3,6 @@ # use apt-cacher in your image build out (and the # Subsequent running container. -Acquire::http { Proxy "http://192.168.2.9:3142"; }; +#Acquire::http { Proxy "http://192.168.2.9:3142"; }; +#Acquire::http { Proxy "http://192.168.0.131:3142"; }; #Acquire::http { Proxy "http://192.168.1.13:3142"; }; diff --git a/perms_wrapper.sh b/perms_wrapper.sh index c6ce165..89d9873 100644 --- a/perms_wrapper.sh +++ b/perms_wrapper.sh @@ -1,7 +1,15 @@ #!/bin/bash +# /etc/ssl/private can't be accessed from within container for some reason +# (@andrewgodwin says it's something AUFS related) - taken from https://github.com/orchardup/docker-postgresql/blob/master/Dockerfile +cp -r /etc/ssl /tmp/ssl-copy/ +chmod -R 0700 /etc/ssl +chown -R postgres /tmp/ssl-copy +rm -r /etc/ssl +mv /tmp/ssl-copy /etc/ssl + # needs to be done as root: chown -R postgres:postgres /var/lib/postgresql # everything else needs to be done as non-root (i.e. postgres) -sudo -u postgres /start-postgis.sh \ No newline at end of file +sudo -u postgres /start-postgis.sh diff --git a/setup.sh b/setup.sh index f2b3804..52ea0fd 100755 --- a/setup.sh +++ b/setup.sh @@ -3,14 +3,6 @@ # These tasks are run as root CONF="/etc/postgresql/9.3/main/postgresql.conf" -# /etc/ssl/private can't be accessed from within container for some reason -# (@andrewgodwin says it's something AUFS related) - taken from https://github.com/orchardup/docker-postgresql/blob/master/Dockerfile -cp -r /etc/ssl /tmp/ssl-copy/ -chmod -R 0700 /etc/ssl -chown -R postgres /tmp/ssl-copy -rm -r /etc/ssl -mv /tmp/ssl-copy /etc/ssl - # Restrict subnet to docker private network echo "host all all 172.17.0.0/16 md5" >> /etc/postgresql/9.3/main/pg_hba.conf # Listen on all ip addresses