diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml index 63f09d716c5a86977b8ee355eadb247c44195f88..b28faee2a54e9c80e27157f7a87caeaecadf72d7 100644 --- a/project-maven-azure-docker/build.yml +++ b/project-maven-azure-docker/build.yml @@ -7,9 +7,10 @@ build: tags: - docker script: - - echo "hello world." - # - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL - # - 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 + - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL + - 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"' \ No newline at end of file + - if: '$CI_COMMIT_REF_NAME == "master"' + when: always + - when: never \ No newline at end of file diff --git a/project-maven-azure-docker/release.yml b/project-maven-azure-docker/release.yml index b3b254f09b45ffa36a634cd2ce9b328ac7e5cb3b..486ba77f6b33f1dc59f5802241b52f8d532d5bb9 100644 --- a/project-maven-azure-docker/release.yml +++ b/project-maven-azure-docker/release.yml @@ -9,4 +9,6 @@ release: - export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA) --released-at $COMMIT_TIME rules: - - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/') \ No newline at end of file + - if: $CI_COMMIT_BRANCH == "master" && ('$CI_COMMIT_TAG == /^v\d+.\d+.\d|\d+.\d+/') + when: always + - when: never \ No newline at end of file