From dadd85ba074ae5474c52143263a2e6fcd3a6fb5d Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 26 Dec 2017 12:18:23 +0200 Subject: [PATCH] Remove extra postgres Dockerfile --- docker-compose.yml | 4 +++- docker/postgres/Dockerfile | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 docker/postgres/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 4d2be3730..41cd1e5de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -172,8 +172,10 @@ services: postgres: container_name: dendrite_postgres hostname: postgres - build: ./docker/postgres + image: postgres:9.5 restart: always + volumes: + - ./docker/postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh environment: POSTGRES_PASSWORD: itsasecret POSTGRES_USER: dendrite diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile deleted file mode 100644 index 84588199a..000000000 --- a/docker/postgres/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM postgres:9.5 - -COPY ./create_db.sh /docker-entrypoint-initdb.d/20-create_db.sh