From 4911c0f9a5ab7459f9e0994d255a2930f335e790 Mon Sep 17 00:00:00 2001 From: Dan Caseley Date: Fri, 3 Sep 2021 18:21:38 +0100 Subject: [PATCH] Stop launch when the database fails --- docker-compose-clustered.yml | 6 +++--- docker-compose-federated.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose-clustered.yml b/docker-compose-clustered.yml index e961118..8afa6d7 100644 --- a/docker-compose-clustered.yml +++ b/docker-compose-clustered.yml @@ -42,7 +42,7 @@ services: - ./_data/xmpp/clustered/1/conf:/var/lib/openfire/conf - ./_data/plugins/hazelcast.jar:/var/lib/openfire/plugins/hazelcast.jar - ./wait-for-it.sh:/wait-for-it.sh - command: ["/wait-for-it.sh", "db:5432", "--", "/sbin/entrypoint.sh"] + command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"] networks: openfire-clustered-net: ipv4_address: 172.60.0.10 @@ -68,7 +68,7 @@ services: - ./_data/xmpp/clustered/2/conf:/var/lib/openfire/conf - ./_data/plugins/hazelcast.jar:/var/lib/openfire/plugins/hazelcast.jar - ./wait-for-it.sh:/wait-for-it.sh - command: ["/wait-for-it.sh", "db:5432", "--", "/sbin/entrypoint.sh"] + command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"] networks: openfire-clustered-net: ipv4_address: 172.60.0.20 @@ -94,7 +94,7 @@ services: - ./_data/xmpp/clustered/3/conf:/var/lib/openfire/conf - ./_data/plugins/hazelcast.jar:/var/lib/openfire/plugins/hazelcast.jar - ./wait-for-it.sh:/wait-for-it.sh - command: ["/wait-for-it.sh", "db:5432", "--", "/sbin/entrypoint.sh"] + command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"] networks: openfire-clustered-net: ipv4_address: 172.60.0.30 diff --git a/docker-compose-federated.yml b/docker-compose-federated.yml index cf982e8..d0d6701 100644 --- a/docker-compose-federated.yml +++ b/docker-compose-federated.yml @@ -43,7 +43,7 @@ services: volumes: - ./_data/xmpp/federated/1/conf:/var/lib/openfire/conf - ./wait-for-it.sh:/wait-for-it.sh - command: ["/wait-for-it.sh", "db1:5432", "--", "/sbin/entrypoint.sh"] + command: ["/wait-for-it.sh", "-s", "db1:5432", "--", "/sbin/entrypoint.sh"] networks: openfire-federated-net: ipv4_address: 172.50.0.10 @@ -66,7 +66,7 @@ services: volumes: - ./_data/xmpp/federated/2/conf:/var/lib/openfire/conf - ./wait-for-it.sh:/wait-for-it.sh - command: ["/wait-for-it.sh", "db2:5432", "--", "/sbin/entrypoint.sh"] + command: ["/wait-for-it.sh", "-s", "db2:5432", "--", "/sbin/entrypoint.sh"] networks: openfire-federated-net: ipv4_address: 172.50.0.20