kopia lustrzana https://github.com/kartoza/docker-postgis
Fix incorrect version in 9.4 branch
rodzic
24f73c6f03
commit
cd39da18fe
|
@ -1,5 +1,5 @@
|
|||
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
|
||||
FROM ubuntu:14.04
|
||||
FROM debian:stable
|
||||
MAINTAINER Tim Sutton<tim@kartoza.com>
|
||||
|
||||
RUN export DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -23,7 +23,8 @@ RUN apt-get -y install ca-certificates rpl pwgen
|
|||
# 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.3-postgis-2.1 postgis
|
||||
RUN apt-get install -y postgresql-9.4-postgis-2.1 postgis
|
||||
ADD postgres.conf /etc/supervisor/conf.d/postgres.conf
|
||||
|
||||
# Open port 5432 so linked containers can see them
|
||||
EXPOSE 5432
|
||||
|
|
8
setup.sh
8
setup.sh
|
@ -1,13 +1,13 @@
|
|||
# Add any additional setup tasks here
|
||||
|
||||
# These tasks are run as root
|
||||
CONF="/etc/postgresql/9.3/main/postgresql.conf"
|
||||
CONF="/etc/postgresql/9.4/main/postgresql.conf"
|
||||
|
||||
# Restrict subnet to docker private network
|
||||
echo "host all all 172.17.0.0/16 md5" >> /etc/postgresql/9.3/main/pg_hba.conf
|
||||
echo "host all all 172.17.0.0/16 md5" >> /etc/postgresql/9.4/main/pg_hba.conf
|
||||
# Listen on all ip addresses
|
||||
echo "listen_addresses = '*'" >> /etc/postgresql/9.3/main/postgresql.conf
|
||||
echo "port = 5432" >> /etc/postgresql/9.3/main/postgresql.conf
|
||||
echo "listen_addresses = '*'" >> /etc/postgresql/9.4/main/postgresql.conf
|
||||
echo "port = 5432" >> /etc/postgresql/9.4/main/postgresql.conf
|
||||
|
||||
# Enable ssl
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
# This script will run as the postgres user due to the Dockerfile USER directive
|
||||
|
||||
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/"
|
||||
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/"
|
||||
|
||||
# /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.3-main.pg_stat_tmp
|
||||
chmod 0777 /var/run/postgresql/9.3-main.pg_stat_tmp
|
||||
mkdir /var/run/postgresql/9.4-main.pg_stat_tmp
|
||||
chmod 0777 /var/run/postgresql/9.4-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.3-main.pid`
|
||||
PID=`cat /var/run/postgresql/9.4-main.pid`
|
||||
kill -9 ${PID}
|
||||
echo "Postgres initialisation process completed .... restarting in foreground"
|
||||
su - postgres -c "$POSTGRES -D $DATADIR -c config_file=$CONF"
|
||||
|
|
Ładowanie…
Reference in New Issue