From 08edd787d4d3554757c66d53b5c1aa497d4b0d9f Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 27 May 2025 17:51:35 +0200 Subject: [PATCH] fixed upgrade script further --- .../cisoassistant/update-ciso-assistant.sh | 16 ------------ .../update-cisoas-enterprise_test.sh | 25 ++++++++----------- 2 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 global/overlay/etc/puppet/modules/net/files/cisoassistant/update-ciso-assistant.sh diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-ciso-assistant.sh b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-ciso-assistant.sh deleted file mode 100644 index 26cd82c..0000000 --- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-ciso-assistant.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /usr/bin/env bash -set -euo pipefail - -#DB_FILE="db/ciso-assistant.sqlite3" -#BACKUP_FILE="ciso-assistant-backup.sqlite3" - -# Backup the database -/usr/bin/docker compose -f /opt/cisoas/docker-compose.yml exec -T postgres /usr/local/bin/backup - -# Stop and clean the containers -docker compose rm -fs - -# note: the rmi trick is not needed anymore since we move to always pull policy -# Start the containers -docker compose up -d -echo "CISO assistant updated successfully" \ No newline at end of file diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh index da482cf..e19057f 100644 --- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh +++ b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh @@ -1,23 +1,20 @@ #! /usr/bin/env bash -VERSION=${1:-community} - - -if [ "$VERSION" = "enterprise" ]; then - BACKEND_IMAGE="ghcr.io/intuitem/ciso-assistant-enterprise-backend:latest" - FRONTEND_IMAGE="ghcr.io/intuitem/ciso-assistant-enterprise-frontend:latest" -else - BACKEND_IMAGE="ghcr.io/intuitem/ciso-assistant-community/backend:latest" - FRONTEND_IMAGE="ghcr.io/intuitem/ciso-assistant-community/frontend:latest" -fi - -echo "Update of the version : $VERSION" - # Backup the database echo "Backing up database" -/opt/cisoas ❯ /usr/bin/docker compose -f /opt/cisoas/docker-compose.yml exec -T postgres /usr/local/bin/backup +backup=$(/usr/bin/docker compose -f /opt/cisoas/docker-compose.yml exec -T postgres /usr/local/bin/backup) + +backup_result=$? + +if [[ $backup_result -ne 0 ]]; then + echo "backup failed, will not upgrade image" + exit 1 +fi + +BACKEND_IMAGE="ghcr.io/intuitem/ciso-assistant-enterprise-backend:latest" +FRONTEND_IMAGE="ghcr.io/intuitem/ciso-assistant-enterprise-frontend:latest" # Stop the containers docker compose down