Fix references to 9.4 to make them 9.3 rather

pull/26/head
Tim Sutton 2015-08-11 23:27:15 +02:00
rodzic 87958f2030
commit 24f73c6f03
2 zmienionych plików z 12 dodań i 12 usunięć

Wyświetl plik

@ -1,13 +1,13 @@
# Add any additional setup tasks here
# These tasks are run as root
CONF="/etc/postgresql/9.4/main/postgresql.conf"
CONF="/etc/postgresql/9.3/main/postgresql.conf"
# Restrict subnet to docker private network
echo "host all all 172.17.0.0/16 md5" >> /etc/postgresql/9.4/main/pg_hba.conf
echo "host all all 172.17.0.0/16 md5" >> /etc/postgresql/9.3/main/pg_hba.conf
# Listen on all ip addresses
echo "listen_addresses = '*'" >> /etc/postgresql/9.4/main/postgresql.conf
echo "port = 5432" >> /etc/postgresql/9.4/main/postgresql.conf
echo "listen_addresses = '*'" >> /etc/postgresql/9.3/main/postgresql.conf
echo "port = 5432" >> /etc/postgresql/9.3/main/postgresql.conf
# Enable ssl

Wyświetl plik

@ -2,11 +2,11 @@
# This script will run as the postgres user due to the Dockerfile USER directive
DATADIR="/var/lib/postgresql/9.4/main"
CONF="/etc/postgresql/9.4/main/postgresql.conf"
POSTGRES="/usr/lib/postgresql/9.4/bin/postgres"
INITDB="/usr/lib/postgresql/9.4/bin/initdb"
SQLDIR="/usr/share/postgresql/9.4/contrib/postgis-2.1/"
DATADIR="/var/lib/postgresql/9.3/main"
CONF="/etc/postgresql/9.3/main/postgresql.conf"
POSTGRES="/usr/lib/postgresql/9.3/bin/postgres"
INITDB="/usr/lib/postgresql/9.3/bin/initdb"
SQLDIR="/usr/share/postgresql/9.3/contrib/postgis-2.1/"
# /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
@ -17,8 +17,8 @@ rm -r /etc/ssl
mv /tmp/ssl-copy /etc/ssl
# Needed under debian, wasnt needed under ubuntu
mkdir /var/run/postgresql/9.4-main.pg_stat_tmp
chmod 0777 /var/run/postgresql/9.4-main.pg_stat_tmp
mkdir /var/run/postgresql/9.3-main.pg_stat_tmp
chmod 0777 /var/run/postgresql/9.3-main.pg_stat_tmp
# test if DATADIR is existent
if [ ! -d $DATADIR ]; then
@ -123,7 +123,7 @@ fi
# This should show up in docker logs afterwards
su - postgres -c "psql -l"
PID=`cat /var/run/postgresql/9.4-main.pid`
PID=`cat /var/run/postgresql/9.3-main.pid`
kill -9 ${PID}
echo "Postgres initialisation process completed .... restarting in foreground"
su - postgres -c "$POSTGRES -D $DATADIR -c config_file=$CONF"