Merge branch 'master' into sarahchen6/mirror-images

Author: sarahchen6

Dockerfile

@@ -132,7 +132,7 @@ WORKDIR /home/non-root-user
 RUN <<-EOT
 	set -eux
 	sudo apt-get update
-	sudo apt-get install -y curl tar apt-transport-https ca-certificates gnupg socat less debian-goodies autossh ca-certificates-java python3-pip locales jq git gh yq lsb-release lsof unzip parallel
+	sudo apt-get install -y curl tar apt-transport-https ca-certificates gnupg socat less debian-goodies autossh ca-certificates-java python3-pip locales jq git gh yq lsb-release lsof unzip parallel xsltproc
 	sudo locale-gen en_US.UTF-8
 	sudo git config --system --add safe.directory "*"
 

build

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