Loading .gitlab-ci.yml +7 −10 Original line number Diff line number Diff line Loading @@ -28,23 +28,20 @@ docker-tag: docker-branch: extends: .docker script: - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME} . - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME} - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} . - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_REF_NAME != "main"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"' deploy-staging: stage: deploy needs: ["docker-branch"] rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_REF_NAME != "main"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"' variables: STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME trigger: project: 'e/online-services/infra/stt-proxy-compose-stack' branch: 'dev/prepare-for-staging' strategy: depend branch: 'main' when: manual variables: STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME No newline at end of file Loading
.gitlab-ci.yml +7 −10 Original line number Diff line number Diff line Loading @@ -28,23 +28,20 @@ docker-tag: docker-branch: extends: .docker script: - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME} . - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME} - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} . - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_REF_NAME != "main"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"' deploy-staging: stage: deploy needs: ["docker-branch"] rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_REF_NAME != "main"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME != "main"' variables: STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME trigger: project: 'e/online-services/infra/stt-proxy-compose-stack' branch: 'dev/prepare-for-staging' strategy: depend branch: 'main' when: manual variables: STT_CONTAINER_IMAGE_TAG: $CI_COMMIT_REF_NAME No newline at end of file