aboutsummaryrefslogtreecommitdiffstats
path: root/build/test/gondul-db-test.Dockerfile
diff options
context:
space:
mode:
authorLasse Haugen <haugen.lasse@gmail.com>2016-12-16 13:02:26 +0100
committerLasse Haugen <haugen.lasse@gmail.com>2016-12-16 13:02:26 +0100
commit8c4fe3a787a1f95e81cdd3e36d66f45115d3322f (patch)
treeb8b3ed907ff634fae047c010d2233cba5598e829 /build/test/gondul-db-test.Dockerfile
parent64e91a665adc3eef4692db80ca98c4f6de29895a (diff)
parentfdfb87ee3fe4166f49aae9349e57ab007bbe0932 (diff)
Merge branch 'master' of github.com:tech-server/gondul
Diffstat (limited to 'build/test/gondul-db-test.Dockerfile')
-rw-r--r--build/test/gondul-db-test.Dockerfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/build/test/gondul-db-test.Dockerfile b/build/test/gondul-db-test.Dockerfile
index b3d013b..38febc6 100644
--- a/build/test/gondul-db-test.Dockerfile
+++ b/build/test/gondul-db-test.Dockerfile
@@ -2,10 +2,8 @@ FROM debian:jessie
RUN apt-get update && apt-get install -y postgresql-9.4
ADD build/test/pg_hba.tail /pg_hba.tail
RUN cat /pg_hba.tail >> /etc/postgresql/9.4/main/pg_hba.conf
-RUN service postgresql start && su postgres -c "psql --command=\"CREATE ROLE nms PASSWORD 'risbrod' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" && su postgres -c "createdb -O nms nms" && service postgresql stop
-ADD build/schema.sql /schema.sql
-RUN service postgresql start && su postgres -c "cat /schema.sql | psql nms" && service postgresql stop
ADD build/test/postgresql.conf /etc/postgresql/9.4/main/postgresql.conf
RUN echo "listen_addresses = '*'" >> /etc/postgresql/9.4/main/postgresql.conf
-CMD pg_ctlcluster --foreground 9.4 main start
+CMD /opt/gondul/build/test/postgres.sh
+VOLUME /var/lib/postgresql
EXPOSE 5432