From b114ab03852b28d7083a81a5798ddee63060c765 Mon Sep 17 00:00:00 2001 From: Henrik Thostrup Jensen <htj@nordu.net> Date: Fri, 20 Jul 2018 12:31:57 +0200 Subject: [PATCH] use dadarek/wait-for-dependencies when starting up opennsa via docker-compose (thanks to Ilya Baldin for reporting) --- docker/Dockerfile | 3 +-- docker/template.yml | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a002857a..6dd60b89 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -52,6 +52,5 @@ ENV PYTHONPATH . EXPOSE 9080 EXPOSE 9443 -# Sleep as postgres take a bit of time to start. HACK ON. -ENTRYPOINT sleep 3 ; twistd -ny opennsa.tac +ENTRYPOINT rm -f twistd.pid; twistd -ny opennsa.tac diff --git a/docker/template.yml b/docker/template.yml index a50aa194..f5d4a469 100644 --- a/docker/template.yml +++ b/docker/template.yml @@ -16,6 +16,7 @@ services: image: opennsa:latest depends_on: - opennsa-db + - waitforpg ports: - 127.0.0.1:9080:9080 - 127.0.0.1:9443:9443 @@ -26,6 +27,12 @@ services: - ${OPENNSA_NRM_FILE}:/home/opennsa/opennsa/opennsa.nrm:ro + waitforpg: + image: dadarek/wait-for-dependencies + depends_on: + - opennsa-db + command: opennsa-db:5432 + volumes: opennsa-pgdata: -- GitLab