From ecb625f57dc73aea067a1c448fb7483c33f1598b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= Date: Tue, 18 Feb 2025 14:30:17 +0100 Subject: [PATCH] [fix] Add rebuilding the container as a generic "fix" attempt --- bin/fix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/bin/fix b/bin/fix index cc70b2e..057dab5 100755 --- a/bin/fix +++ b/bin/fix @@ -28,20 +28,32 @@ if /federated/bin/check ${SERVICE}; then exit 0 fi -[ -e /federated/services/${SERVICE}/fix ] && . /federated/services/${SERVICE}/fix +if [ -e /federated/services/${SERVICE}/fix ]; then + . /federated/services/${SERVICE}/fix -if /federated/bin/check ${SERVICE}; then - echo "${SERVICE} was (probably) fixed by the service fix script" - exit 0 + if /federated/bin/check ${SERVICE}; then + echo "${SERVICE} was (probably) fixed by the service fix script" + exit 0 + fi + + /federated/bin/stop ${SERVICE} + /federated/bin/start ${SERVICE} + + if /federated/bin/check ${SERVICE}; then + echo "${SERVICE} was (probably) fixed by restarting after running the fix script" + exit 0 + fi fi -/federated/bin/stop ${SERVICE} +docker compose -f /federated/apps/${SERVICE}/docker-compose.yml down +docker rm ${SERVICE} +/federated/bin/stop ${SERVICE} || : /federated/bin/start ${SERVICE} - if /federated/bin/check ${SERVICE}; then - echo "${SERVICE} was (probably) fixed by restarting after running the fix script" + echo "${SERVICE} was (probably) fixed by rebuilding the container" exit 0 fi + echo "${SERVICE} is still broken. Please improve the fix script." exit 1