From d606f8f06402b1177210ad71a625945ef6e21cd6 Mon Sep 17 00:00:00 2001 From: Mehran Kholdi Date: Mon, 13 Jul 2020 21:17:47 +0430 Subject: [PATCH] [skip-e2e] Use slugified branch name as docker image tag --- .ci/common | 5 +++++ .ci/publish.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.ci/common b/.ci/common index 60514eb..95b7fb9 100644 --- a/.ci/common +++ b/.ci/common @@ -1,9 +1,14 @@ #!/bin/bash set -ex +slugify() { + echo "$1" | sed -r 's/[^a-zA-Z0-9]+/-/g' +} + export IMAGE="openebs/rawfile-localpv" export COMMIT=$(git rev-parse --short HEAD) export BRANCH=${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)} +export BRANCH_SLUG=$(slugify $BRANCH) export CI_REGISTRY="docker.io" export CI_TAG="${COMMIT}-ci" diff --git a/.ci/publish.sh b/.ci/publish.sh index 0a970ef..8659abe 100755 --- a/.ci/publish.sh +++ b/.ci/publish.sh @@ -5,6 +5,6 @@ source .ci/common docker pull ${CI_IMAGE_URI} docker login -u "${DNAME}" -p "${DPASS}"; -for TAG in $COMMIT $BRANCH; do +for TAG in $COMMIT $BRANCH_SLUG; do TagAndPushImage "docker.io/${IMAGE}" $TAG; done;