Browse Source

Remove the helm prefix from helm-op version

Fix #1320
Stefan Prodan 1 year ago
parent
commit
e12e853b42
2 changed files with 4 additions and 1 deletions
  1. 0
    1
      .circleci/config.yml
  2. 4
    0
      docker/image-tag

+ 0
- 1
.circleci/config.yml View File

@@ -36,7 +36,6 @@ jobs:
36 36
             if echo "${CIRCLE_TAG}" | grep -Eq "helm-[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
37 37
               docker login -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" quay.io
38 38
               RELEASE_TAG=$(echo "$CIRCLE_TAG" | cut -c 6-)
39
-              docker tag "quay.io/weaveworks/helm-operator:${CIRCLE_TAG}" "quay.io/weaveworks/helm-operator:${RELEASE_TAG}"
40 39
               docker push "quay.io/weaveworks/helm-operator:${RELEASE_TAG}"
41 40
             fi
42 41
 

+ 4
- 0
docker/image-tag View File

@@ -12,6 +12,10 @@ fi
12 12
 # If a tagged version, just print that tag
13 13
 HEAD_TAGS=$(git tag --points-at HEAD)
14 14
 if [ -n "${HEAD_TAGS}" ] ; then
15
+    # remove helm- prefix from helm-op release name
16
+    if echo "${HEAD_TAGS}" | grep -Eq "helm-[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
17
+      HEAD_TAGS=$(echo "$HEAD_TAGS" | cut -c 6-)
18
+    fi
15 19
 	echo ${HEAD_TAGS}
16 20
 	exit 0
17 21
 fi

Loading…
Cancel
Save