diff --git a/configs/deployment/docker-compose-app.yml b/configs/deployment/docker-compose-app.yml index 34b031a8..dd150a5a 100644 --- a/configs/deployment/docker-compose-app.yml +++ b/configs/deployment/docker-compose-app.yml @@ -25,6 +25,9 @@ services: image: devops.sozsoft.com/kurs/kurs-platform-api:latest container_name: kurs-api profiles: ["api"] + depends_on: + sql: + condition: service_healthy environment: - ASPNETCORE_ENVIRONMENT=Dev ports: diff --git a/configs/deployment/docker-compose-data.yml b/configs/deployment/docker-compose-data.yml index f816cc39..fc922528 100644 --- a/configs/deployment/docker-compose-data.yml +++ b/configs/deployment/docker-compose-data.yml @@ -51,4 +51,10 @@ services: db: aliases: - sql + healthcheck: + test: ["CMD-SHELL", "sqlcmd -S localhost -U sa -P NvQp8s@l -Q 'SELECT 1'"] + interval: 10s + timeout: 5s + retries: 5 + start_period: 30s restart: unless-stopped diff --git a/configs/deployment/scripts/deploy/app.sh b/configs/deployment/scripts/deploy/app.sh index bdfb17fe..aa74ff46 100644 --- a/configs/deployment/scripts/deploy/app.sh +++ b/configs/deployment/scripts/deploy/app.sh @@ -16,12 +16,12 @@ cd ~/kurs-platform/configs/deployment docker compose -f docker-compose-app.yml -f docker-compose-app.${ENV}.yml --profile api pull docker compose -f docker-compose-app.yml -f docker-compose-app.${ENV}.yml --profile api up -d -API_URL="https://api.sozsoft.com/api/app/platform-tenant?skipCount=0&maxResultCount=1" +# API_URL="https://api.sozsoft.com/api/app/platform-tenant?skipCount=0&maxResultCount=1" -echo "kurs-api açılması bekleniyor: $API_URL" -until curl -fsS --max-time 5 -o /dev/null "$API_URL"; do - sleep 2 -done +# echo "kurs-api açılması bekleniyor: $API_URL" +# until curl -fsS --max-time 5 -o /dev/null "$API_URL"; do +# sleep 2 +# done docker compose -f docker-compose-app.yml -f docker-compose-app.${ENV}.yml --profile ui pull docker compose -f docker-compose-app.yml -f docker-compose-app.${ENV}.yml --profile ui up -d