From 46f10e88263dc1025492d753ca76004abeed8009 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 31 Oct 2024 15:45:19 +0100 Subject: [PATCH] refs #964 do not destroy containers, wait before provisioning --- component-installer.sh | 2 +- provision_ogcore.sh | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/component-installer.sh b/component-installer.sh index 607cf02..1613c53 100644 --- a/component-installer.sh +++ b/component-installer.sh @@ -29,7 +29,7 @@ Requires=docker.service WorkingDirectory=/opt/opengnsys/ogCore/repo/ ExecStart=/usr/bin/docker compose -f docker-compose-deploy.yml up ExecStartPost=/opengnsys-installer/provision_ogcore.sh -ExecStop=/usr/bin/docker compose -f docker-compose-deploy.yml down +ExecStop=/usr/bin/docker compose -f docker-compose-deploy.yml stop Restart=always [Install] diff --git a/provision_ogcore.sh b/provision_ogcore.sh index dfbaae7..122397a 100644 --- a/provision_ogcore.sh +++ b/provision_ogcore.sh @@ -7,15 +7,20 @@ if [ -f /opt/opengnsys/ogCore/installer/.deployed ]; then exit 0 fi -docker compose -f docker-compose-deploy.yml exec php composer install -docker compose -f docker-compose-deploy.yml exec php php bin/console lexik:jwt:generate-keypair --overwrite -docker compose -f docker-compose-deploy.yml exec php php bin/console doctrine:migrations:migrate --no-interaction -docker compose -f docker-compose-deploy.yml exec php php bin/console doctrine:fixtures:load --no-interaction - +while ! docker compose -f docker-compose-deploy.yml ps --format json |jq -r '.["Name"] + " " + .["State"]' |grep -q 'ogcore-php running'; do + sleep 2 +done adminuser=$(jq -r '.username' /opt/opengnsys/ogCore/installer/config.json) adminpass=$(jq -r '.password' /opt/opengnsys/ogCore/installer/config.json) +docker compose -f docker-compose-deploy.yml exec php composer install +docker compose -f docker-compose-deploy.yml exec php php bin/console lexik:jwt:generate-keypair --overwrite +docker compose -f docker-compose-deploy.yml exec php php bin/console doctrine:migrations:migrate --no-interaction +## TODO we need to feed $adminuser and $adminpass to doctrine:fixtures:load somehow +docker compose -f docker-compose-deploy.yml exec php php bin/console doctrine:fixtures:load --no-interaction + + # Provision user admin curl -k -X 'POST' \ 'https://localhost:8443/auth/login' \