diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3713843dd321f41b4b67701fda4464fe634954f..3379cca2a853ba1943651d0cb4f55b3a1da3a7d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ workflow: DOCKER_IMAGE_TAG: ":$CI_COMMIT_REF_NAME" -docker-test-build: +docker-build-test: variables: if: main # Official docker image. @@ -30,7 +30,7 @@ docker-test-build: - docker push $CI_REGISTRY_IMAGE$DOCKER_IMAGE_TAG -docker-build-master: +docker-build-main: # Official docker image. image: docker$DOCKER_BUILD_IMAGE_TAG stage: build @@ -41,8 +41,7 @@ docker-build-master: script: - docker build --pull -t "$CI_REGISTRY_IMAGE" . - docker push "$CI_REGISTRY_IMAGE" - only: - - main + # deploy test/dev version on 'sdc-dev.astron.nl' @@ -82,8 +81,7 @@ docker-deploy-main-test: - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p adex-backend -f /docker_compose/adex-backend-fastapi/docker-compose-dev-cd.yml up -d" - echo "Application deployed" when: manual - only: - - main + docker-deploy-main-production: # image: docker:latest @@ -122,6 +120,5 @@ docker-deploy-main-production: - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p adex-backend -f /opt/dockercompose/adex-backend-fastapi/docker-compose-production-cd.yml up -d" - echo "Application deployed" when: manual - only: - - main +