From b98f856b89d829a80ec36129df6c2ce15a15acf1 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Tue, 21 Apr 2020 10:14:25 +0200 Subject: [PATCH] ci: cleanup and add image tag with core version --- .gitlab-ci.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb10c3d6..e6985467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,11 +80,15 @@ docker: services: - docker:dind script: - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com - - docker build -t registry.gitlab.com/openstapps/api/cli:$CI_COMMIT_REF_NAME . - - docker push registry.gitlab.com/openstapps/api/cli:$CI_COMMIT_REF_NAME - - docker build -t registry.gitlab.com/openstapps/api/cli:latest . - - docker push registry.gitlab.com/openstapps/api/cli:latest + - export VERSION=$(node -p "require('./package.json').version") + - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core) + - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/cli + - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION + - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION + - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest + - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker build -t $IMAGETAG_LATEST -t $IMAGETAG_VERSION -t $IMAGETAG_CORE_VERSION . + - docker push $IMAGETAG_BASE tags: - docker only: @@ -102,9 +106,11 @@ branch: services: - docker:dind script: - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com - - docker build -t registry.gitlab.com/openstapps/api/cli:$CI_COMMIT_REF_NAME . - - docker push registry.gitlab.com/openstapps/api/cli:$CI_COMMIT_REF_NAME + - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$REGISTRY_BRANCH/cli + - export IMAGETAG_BRANCH=$IMAGETAG_BASE:$CI_COMMIT_REF_SLUG + - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker build -t $IMAGETAG_BRANCH . + - docker push $IMAGETAG_BASE except: - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/ only: