Loading .gitlab-ci.yml +4 −7 Original line number Diff line number Diff line Loading @@ -62,24 +62,21 @@ build: before_script: - docker info script: - docker build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -t "$CI_REGISTRY_IMAGE:latest" . - export TEST_IMAGE_TAG="ci-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" - docker build -t "$CI_REGISTRY_IMAGE:$TEST_IMAGE_TAG" . rules: - if: '$CI_COMMIT_BRANCH == "add-oeg-baseline-ci"' push: stage: push tags: - shell needs: - build before_script: - docker info script: - export TEST_IMAGE_TAG="ci-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" - docker push "$CI_REGISTRY_IMAGE:latest" - docker push "$CI_REGISTRY_IMAGE:$TEST_IMAGE_TAG" - docker logout "$CI_REGISTRY" rules: - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/' - if: '$CI_COMMIT_BRANCH == "add-oeg-baseline-ci"' No newline at end of file Loading
.gitlab-ci.yml +4 −7 Original line number Diff line number Diff line Loading @@ -62,24 +62,21 @@ build: before_script: - docker info script: - docker build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -t "$CI_REGISTRY_IMAGE:latest" . - export TEST_IMAGE_TAG="ci-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" - docker build -t "$CI_REGISTRY_IMAGE:$TEST_IMAGE_TAG" . rules: - if: '$CI_COMMIT_BRANCH == "add-oeg-baseline-ci"' push: stage: push tags: - shell needs: - build before_script: - docker info script: - export TEST_IMAGE_TAG="ci-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" - docker push "$CI_REGISTRY_IMAGE:latest" - docker push "$CI_REGISTRY_IMAGE:$TEST_IMAGE_TAG" - docker logout "$CI_REGISTRY" rules: - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/' - if: '$CI_COMMIT_BRANCH == "add-oeg-baseline-ci"' No newline at end of file