diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 447a9728f58d483f834e24ecc08b86e11f6a3040..29fab3d4ca0cd9923fb41f0ca8732e745274c37f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,13 +144,13 @@ publish-dev-docker-container-job: - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" - --destination "${CI_REGISTRY_IMAGE}:dev-${CI_COMMIT_SHA}" - --destination "${CI_REGISTRY_IMAGE}:dev-latest" + --destination "${CI_REGISTRY_IMAGE}:main-${CI_COMMIT_SHA}" + --destination "${CI_REGISTRY_IMAGE}:main-latest" - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile-Gunicorn" - --destination "${CI_REGISTRY_IMAGE}:dev-${CI_COMMIT_SHA}-gunicorn" - --destination "${CI_REGISTRY_IMAGE}:dev-latest-gunicorn" + --destination "${CI_REGISTRY_IMAGE}:main-${CI_COMMIT_SHA}-gunicorn" + --destination "${CI_REGISTRY_IMAGE}:main-latest-gunicorn" publish-docker-container-job: stage: deploy diff --git a/scripts/prestart.sh b/scripts/prestart.sh index f7cf08b61cef15de66abae7793fc0ef43a074f68..a632192526f81d1a48c82f36a9e7017e9fc95b6d 100755 --- a/scripts/prestart.sh +++ b/scripts/prestart.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # Check Connection to Ceph RGW -python app/check_ceph_connection.py +python app/check_s3_connection.py # Check Connection to Slurm Cluster python app/check_slurm_connection.py # Let the DB start