From e911d0866df12d8a61d86c3a17e2ce330d791b7f Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 30 Aug 2021 11:07:56 +0200
Subject: [PATCH] L2SS-326: Restart critical containers even if they bailed, to
make sure they're available as much as possible. This includes the core Tango
services (including archiving), the logging server (to avoid losing log
entries), and the jupyter container (to avoid losing remote access).
---
docker-compose/archiver.yml | 3 ++-
docker-compose/elk.yml | 1 +
docker-compose/jupyter.yml | 2 +-
docker-compose/tango.yml | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index 41d5df160..8006ece3b 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -15,7 +15,7 @@ services:
- MYSQL_USER=tango
- MYSQL_PASSWORD=tango
- TANGO_HOST=${TANGO_HOST}
- restart: on-failure
+ restart: unless-stopped
hdbpp-es:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
@@ -34,6 +34,7 @@ services:
wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict --
wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
hdbppes-srv 01"
+ restart: unless-stopped
hdbpp-cm:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}
diff --git a/docker-compose/elk.yml b/docker-compose/elk.yml
index cce66839b..bf6e22e3d 100644
--- a/docker-compose/elk.yml
+++ b/docker-compose/elk.yml
@@ -38,3 +38,4 @@ services:
- "5959:5959" # logstash tcp json input
depends_on:
- elk-configure-host
+ restart: unless-stopped
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 36cc0acbc..989601cf8 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -38,4 +38,4 @@ services:
- --strict
- --
- /usr/bin/tini -- /usr/local/bin/jupyter-notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root --NotebookApp.token= --NotebookApp.password=
- restart: on-failure
+ restart: unless-stopped
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index b3a860d7b..9fa0f5cde 100644
--- a/docker-compose/tango.yml
+++ b/docker-compose/tango.yml
@@ -28,7 +28,7 @@ services:
- tangodb:/var/lib/mysql
ports:
- "3306:3306"
- restart: on-failure
+ restart: unless-stopped
databaseds:
image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
@@ -55,4 +55,4 @@ services:
- "2"
- -ORBendPoint
- giop:tcp::10000
- restart: on-failure
+ restart: unless-stopped
--
GitLab