From 5ceccf925015788a83ca7559f0c29ec6215e2355 Mon Sep 17 00:00:00 2001 From: Lewis Stevens Date: Thu, 26 Oct 2023 14:02:31 +0100 Subject: [PATCH 1/3] Adjusting the healthcheck --- scripts/start-govuk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start-govuk.sh b/scripts/start-govuk.sh index 36e2a0cb..50b39c42 100644 --- a/scripts/start-govuk.sh +++ b/scripts/start-govuk.sh @@ -8,7 +8,7 @@ function configure_container_role(){ function run_celery(){ cd $DIR_GOVUK; - . $VENV_GOVUK/bin/activate && make run-celery + . $VENV_GOVUK/bin/activate && make run-celery & } function flask_publish(){ @@ -21,6 +21,6 @@ if [[ ! -z $DEBUG ]]; then while true; do echo 'Debug mode active..'; sleep 30; done else configure_container_role - flask_publish run_celery + flask_publish fi From 6c081440b2cee7a7998b72a677e330c66a134e5c Mon Sep 17 00:00:00 2001 From: Lewis Stevens Date: Thu, 26 Oct 2023 14:28:34 +0100 Subject: [PATCH 2/3] Try implementing a foreground process --- scripts/start-govuk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/start-govuk.sh b/scripts/start-govuk.sh index 50b39c42..dc0b7605 100644 --- a/scripts/start-govuk.sh +++ b/scripts/start-govuk.sh @@ -14,6 +14,7 @@ function run_celery(){ function flask_publish(){ cd $DIR_GOVUK; . $VENV_GOVUK/bin/activate && flask publish-with-assets + fg } if [[ ! -z $DEBUG ]]; then From d44e27ea083c74ee4b695031ad8672422c9efddf Mon Sep 17 00:00:00 2001 From: Lewis Stevens Date: Thu, 26 Oct 2023 14:38:55 +0100 Subject: [PATCH 3/3] readjust the healthcheck --- scripts/start-govuk.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/start-govuk.sh b/scripts/start-govuk.sh index dc0b7605..2fb5b8d3 100644 --- a/scripts/start-govuk.sh +++ b/scripts/start-govuk.sh @@ -8,13 +8,12 @@ function configure_container_role(){ function run_celery(){ cd $DIR_GOVUK; - . $VENV_GOVUK/bin/activate && make run-celery & + . $VENV_GOVUK/bin/activate && make run-celery } function flask_publish(){ cd $DIR_GOVUK; - . $VENV_GOVUK/bin/activate && flask publish-with-assets - fg + . $VENV_GOVUK/bin/activate && flask publish-with-assets & } if [[ ! -z $DEBUG ]]; then @@ -22,6 +21,6 @@ if [[ ! -z $DEBUG ]]; then while true; do echo 'Debug mode active..'; sleep 30; done else configure_container_role - run_celery flask_publish + run_celery fi