fix: import the push.sh script in the push command (#131)

* fix: import push script in the command * fix: evaluate tag when digest path is set
CircleCI-Public · Jun 13, 2022 · e7143bf · e7143bf
1 parent 281e557
commit e7143bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/commands/push.yml b/src/commands/push.yml
@@ -34,14 +34,4 @@ steps:
         PARAM_IMAGE: <<parameters.image>>
         PARAM_TAG: <<parameters.tag>>
         PARAM_DIGEST_PATH: <<parameters.digest-path>>
-      command: |
-        IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
-        for tag in "${DOCKER_TAGS[@]}"; do
-          docker push <<parameters.registry>>/<< parameters.image>>:${tag}
-        done
-
-        if [ -n "<<parameters.digest-path>>" ]; then
-          mkdir -p "$(dirname <<parameters.digest-path>>)"
-          IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
-          docker image inspect --format="{{index .RepoDigests 0}}" <<parameters.registry>>/<< parameters.image>>:"${DOCKER_TAGS[0]}" > "<<parameters.digest-path>>"
-        fi
+      command: << include(scripts/push.sh) >>
diff --git a/src/scripts/push.sh b/src/scripts/push.sh
@@ -2,12 +2,14 @@
 
 IFS="," read -ra DOCKER_TAGS <<< "$PARAM_TAG"
 
-for tag in "${DOCKER_TAGS[@]}"; do
-  docker push "$PARAM_REGISTRY"/"$PARAM_IMAGE":${tag}
+for docker_tag in "${DOCKER_TAGS[@]}"; do
+  tag=$(eval echo "$docker_tag")
+  docker push "$PARAM_REGISTRY"/"$PARAM_IMAGE":"$tag"
 done
 
 if [ -n "$PARAM_DIGEST_PATH" ]; then
   mkdir -p "$(dirname "$PARAM_DIGEST_PATH")"
   IFS="," read -ra DOCKER_TAGS <<< "$PARAM_TAG"
-  docker image inspect --format="{{index .RepoDigests 0}}" "$PARAM_REGISTRY"/"$PARAM_IMAGE":"${DOCKER_TAGS[0]}" > "$PARAM_DIGEST_PATH"
+  tag=$(eval echo "${DOCKER_TAGS[0]}")
+  docker image inspect --format="{{index .RepoDigests 0}}" "$PARAM_REGISTRY"/"$PARAM_IMAGE":"$tag" > "$PARAM_DIGEST_PATH"
 fi