Skip to content
Snippets Groups Projects
Commit f8af2505 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-326-restart-tangodb' into 'master'

L2SS-326: Restart critical containers even if they bailed

Closes L2SS-326

See merge request !104
parents 87d861a3 c7fc2e7b
No related branches found
No related tags found
1 merge request!104L2SS-326: Restart critical containers even if they bailed
...@@ -15,7 +15,7 @@ services: ...@@ -15,7 +15,7 @@ services:
- MYSQL_USER=tango - MYSQL_USER=tango
- MYSQL_PASSWORD=tango - MYSQL_PASSWORD=tango
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
restart: on-failure restart: unless-stopped
hdbpp-es: hdbpp-es:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28 image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
...@@ -34,6 +34,7 @@ services: ...@@ -34,6 +34,7 @@ services:
wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict -- wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict --
wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict -- wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
hdbppes-srv 01" hdbppes-srv 01"
restart: unless-stopped
hdbpp-cm: hdbpp-cm:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION} image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}
......
...@@ -38,3 +38,4 @@ services: ...@@ -38,3 +38,4 @@ services:
- "5959:5959" # logstash tcp json input - "5959:5959" # logstash tcp json input
depends_on: depends_on:
- elk-configure-host - elk-configure-host
restart: unless-stopped
...@@ -37,4 +37,4 @@ services: ...@@ -37,4 +37,4 @@ services:
- --strict - --strict
- -- - --
- /venv/bin/itango3 - /venv/bin/itango3
restart: on-failure restart: unless-stopped
...@@ -38,4 +38,4 @@ services: ...@@ -38,4 +38,4 @@ services:
- --strict - --strict
- -- - --
- /usr/bin/tini -- /usr/local/bin/jupyter-notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root --NotebookApp.token= --NotebookApp.password= - /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
...@@ -28,7 +28,7 @@ services: ...@@ -28,7 +28,7 @@ services:
- tangodb:/var/lib/mysql - tangodb:/var/lib/mysql
ports: ports:
- "3306:3306" - "3306:3306"
restart: on-failure restart: unless-stopped
databaseds: databaseds:
image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION} image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
...@@ -55,4 +55,4 @@ services: ...@@ -55,4 +55,4 @@ services:
- "2" - "2"
- -ORBendPoint - -ORBendPoint
- giop:tcp::10000 - giop:tcp::10000
restart: on-failure restart: unless-stopped
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment