From fefe284a2b2c8dc2628cfc8af99dbc1ff43d6ab6 Mon Sep 17 00:00:00 2001 From: Micaiah Martin <77340197+mimartin12@users.noreply.github.com> Date: Thu, 30 Dec 2021 11:27:25 -0700 Subject: [PATCH] Add key connector check for update function in run.sh (#1790) * Added logic to check if key-connector is enabled --- scripts/run.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/run.sh b/scripts/run.sh index d0a29c82ab..a08a4655bd 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -188,14 +188,24 @@ function updateDatabase() { } function updatebw() { + KEY_CONNECTOR_ENABLED=$(grep -A3 'enable_key_connector:' $OUTPUT_DIR/config.yml | tail -n1 | awk '{ print $2}') CORE_ID=$(docker-compose ps -q admin) WEB_ID=$(docker-compose ps -q web) - #KEYCONNECTOR_ID=$(docker-compose ps -q key-connector) - #if docker inspect --format='{{.Config.Image}}:' $CORE_ID | grep -F ":$COREVERSION:" | grep -q ":[0-9.]*:$" && - # docker inspect --format='{{.Config.Image}}:' $WEB_ID | grep -F ":$WEBVERSION:" | grep -q ":[0-9.]*:$" && - # docker inspect --format='{{.Config.Image}}:' $KEYCONNECTOR_ID | grep -F ":$KEYCONNECTORVERSION:" | grep -q ":[0-9.]*:$" - if docker inspect --format='{{.Config.Image}}:' $CORE_ID | grep -F ":$COREVERSION:" | grep -q ":[0-9.]*:$" && - docker inspect --format='{{.Config.Image}}:' $WEB_ID | grep -F ":$WEBVERSION:" | grep -q ":[0-9.]*:$" + if [ $KEY_CONNECTOR_ENABLED = true ]; + then + KEYCONNECTOR_ID=$(docker-compose ps -q key-connector) + fi + + if [ $KEYCONNECTOR_ID ] && + docker inspect --format='{{.Config.Image}}:' $CORE_ID | grep -F ":$COREVERSION:" | grep -q ":[0-9.]*:$" && + docker inspect --format='{{.Config.Image}}:' $WEB_ID | grep -F ":$WEBVERSION:" | grep -q ":[0-9.]*:$" && + docker inspect --format='{{.Config.Image}}:' $KEYCONNECTOR_ID | grep -F ":$KEYCONNECTORVERSION:" | grep -q ":[0-9.]*:$" + then + echo "Update not needed" + exit + elif + docker inspect --format='{{.Config.Image}}:' $CORE_ID | grep -F ":$COREVERSION:" | grep -q ":[0-9.]*:$" && + docker inspect --format='{{.Config.Image}}:' $WEB_ID | grep -F ":$WEBVERSION:" | grep -q ":[0-9.]*:$" then echo "Update not needed" exit