diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml index b4dfe28a60e4ac7c03b4c22189767a6b4be30364..b28faee2a54e9c80e27157f7a87caeaecadf72d7 100644 --- a/project-maven-azure-docker/build.yml +++ b/project-maven-azure-docker/build.yml @@ -7,10 +7,9 @@ build: tags: - docker script: - - echo "CI BUILD" - # - 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"' when: always diff --git a/project-maven-azure-docker/release.yml b/project-maven-azure-docker/release.yml index ee567c8e0ef8713d01a1a16e749b1a98ddbb5630..486ba77f6b33f1dc59f5802241b52f8d532d5bb9 100644 --- a/project-maven-azure-docker/release.yml +++ b/project-maven-azure-docker/release.yml @@ -4,11 +4,10 @@ release: tags: - docker script: - - echo "CI BUILD" - # release-cli create --name $CI_COMMIT_TAG --description awesome-release - # --milestone $CI_COMMIT_TAG - # - export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA) - # --released-at $COMMIT_TIME + release-cli create --name $CI_COMMIT_TAG --description awesome-release + --milestone $CI_COMMIT_TAG + - 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+/') when: always