diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml index 060a708826f8be1e4c7d725579af449f1da11541..2ad6ce374572fd25f751f0656e6b9bb89610a641 100644 --- a/project-maven-azure-docker/build.yml +++ b/project-maven-azure-docker/build.yml @@ -11,6 +11,4 @@ build: - docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME --build-arg CI_TOKEN=$ACR_PASSWORD -t $CONTAINER_IMAGE ./ - docker push $CONTAINER_IMAGE rules: - - if: '$CI_COMMIT_REF_NAME =~ "master"' - when: never - - when: on_success \ No newline at end of file + - if: '$CI_COMMIT_REF_NAME =~ "master"' \ No newline at end of file diff --git a/project-maven-azure-docker/release.yml b/project-maven-azure-docker/release.yml index 7bd6d9d3b1be9f8006e972f2382cedfc0c293181..b3b254f09b45ffa36a634cd2ce9b328ac7e5cb3b 100644 --- a/project-maven-azure-docker/release.yml +++ b/project-maven-azure-docker/release.yml @@ -9,8 +9,4 @@ release: - export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA) --released-at $COMMIT_TIME rules: - - if: ('$CI_COMMIT_TAG =~ /^v\d+.\d+.\d|\d+.\d+/') - when: never - - if: '$CI_COMMIT_REF_NAME =~ "master"' - when: never - - when: on_success \ No newline at end of file + - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/') \ No newline at end of file