From d59a4422af26b37fcd6ef37484f09a444fb4b304 Mon Sep 17 00:00:00 2001 From: tuutti Date: Mon, 4 Dec 2023 08:49:25 +0200 Subject: [PATCH 1/2] UHF-9399: Remove deployment checks from cron entrypoint --- docker/openshift/crons/base.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh index 6844e8ab..a45e411f 100644 --- a/docker/openshift/crons/base.sh +++ b/docker/openshift/crons/base.sh @@ -1,23 +1,5 @@ #!/bin/bash -# Checking if a new deployment is in progress, as we should not run cron while deploying. -if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then - echo "OPENSHIFT_BUILD_NAME is not defined. Exiting early." - exit 1 -fi - -while [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ] -do - echo "Current deploy_id $OPENSHIFT_BUILD_NAME not found in state. Probably a deployment is in progress - waiting for completion..." - sleep 60 -done - -while [ "$(drush state:get system.maintenance_mode)" = "1" ] -do - echo "Maintenance mode on. Probably a deployment is in progress - waiting for completion..." - sleep 60 -done - echo "Starting cron: $(date)" # You can add any additional cron "daemons" here: From 8cf8ab570b8dce406331941fec5faee5bcfc1a26 Mon Sep 17 00:00:00 2001 From: tuutti Date: Mon, 4 Dec 2023 08:57:51 +0200 Subject: [PATCH 2/2] UHF-9399: Readded init.sh checks --- docker/openshift/crons/base.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh index a45e411f..3c390d25 100644 --- a/docker/openshift/crons/base.sh +++ b/docker/openshift/crons/base.sh @@ -1,5 +1,7 @@ #!/bin/bash +source /init.sh + echo "Starting cron: $(date)" # You can add any additional cron "daemons" here: