Tidy bash scripts

cyber-dojo-retired · Aug 21, 2020 · 7d30584 · 7d30584
1 parent a6a167c
commit 7d30584
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
           command: |
             export AVATARS_COVERAGE=off
             export AVATARS_DEMO=off
-            ./build_test_tag_publish.sh
+            ./build_tag_test_publish.sh
 
   deploy-to-beta:
     docker:

diff --git a/build_test_tag_publish.sh → build_tag_test_publish.sh b/build_test_tag_publish.sh → build_tag_test_publish.sh
@@ -14,9 +14,9 @@ fi
 source ${SH_DIR}/versioner_env_vars.sh
 export $(versioner_env_vars)
 ${SH_DIR}/build_docker_images.sh "$@"
+${SH_DIR}/tag_image.sh
 ${SH_DIR}/containers_up.sh "$@"
 ${SH_DIR}/test_in_containers.sh "$@"
 ${SH_DIR}/containers_down.sh
-${SH_DIR}/tag_image.sh
 ${SH_DIR}/on_ci_publish_tagged_images.sh
 # open file://${SH_DIR}/../test_server/coverage/index.html
diff --git a/sh/tag_image.sh b/sh/tag_image.sh
@@ -7,8 +7,9 @@ tag_image()
   local -r sha="$(image_sha)"
   local -r tag="${sha:0:7}"
   docker tag "${image}:latest" "${image}:${tag}"
-  echo "${sha}"
-  echo "${tag}"
+  echo
+  echo "CYBER_DOJO_AVATARS_SHA=${sha}"
+  echo "CYBER_DOJO_AVATARS_TAG=${tag}"
 }
 
 # - - - - - - - - - - - - - - - - - - - - - - - -