From 047e34d29f60e239e3fccba59a6fc83a174ce626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Lopez=20de=20Guere=C3=B1a?=
<jon.lopezdeguerena@tecnalia.com>
Date: Mon, 7 Jun 2021 12:36:44 +0200
Subject: [PATCH] test
---
project-maven-azure-docker/build.yml | 11 ++++++-----
project-maven-azure-docker/release.yml | 4 +++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml
index 63f09d7..b28faee 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 b3b254f..486ba77 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
--
GitLab