Separate out ci- tagging logic

Author: sarahchen6

build

@@ -233,19 +233,20 @@ function do_push() {
 }
 
 function do_tag() {
-    local tag
+    local tag token version
     TAG_PREFIX=
     echo "Pulling latest images"
     for tag in base latest "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
         tag="${tag,,}"
         tag="$(image_name "${tag}")"
         docker pull "$tag"
     done
-    echo "Tagging ci- images"
+    version="$(date +%y.%m)"
+    echo "Tagging version $version"
     for tag in base latest "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
         tag="${tag,,}"
         tag="$(image_name "${tag}")"
-        new_tag="${tag/:/:ci-}"
+        new_tag="${tag/:/:v$version-}"
         docker tag "$tag" "$new_tag"
         docker push "$new_tag"
     done