Merge branch '9.5-2.2' into develop

pull/50/head
Tim Sutton 2016-09-06 12:15:51 +02:00
commit cf01b5c56c
1 zmienionych plików z 0 dodań i 1 usunięć

Wyświetl plik

@ -30,7 +30,6 @@ RUN apt-get -y install ca-certificates rpl pwgen
# 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
ADD postgres.conf /etc/supervisor/conf.d/postgres.conf
# Open port 5432 so linked containers can see them
EXPOSE 5432