Retag docker images for regular builds as /hive/hivemind, removing

the /instance from the end, to match how we name tagged releases

.gitlab-ci.yaml

@@ -80,6 +80,7 @@ include:
       "$CI_REGISTRY_IMAGE" \
       --dot-env-filename=hivemind_image.env \
       --dot-env-var-name=HIVEMIND_IMAGE
+    docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
     if [[ -n "$CI_COMMIT_TAG" ]]; then
       docker pull "$CI_REGISTRY_IMAGE/instance:$CI_COMMIT_SHORT_SHA"
       docker tag "$CI_REGISTRY_IMAGE/instance:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/instance:$CI_COMMIT_TAG"

scripts/ci-helpers/build_instance.sh

@@ -64,6 +64,7 @@ done
 
 # Supplement a registry path by trailing slash (if needed)
 [[ "${REGISTRY}" != */ ]] && REGISTRY="${REGISTRY}/"
+REGISTRY_WITHOUT_SLASH="$(echo "$REGISTRY" | sed 's/\/$//')"
 
 printf "Moving into source root directory: %s\n" "$SRCROOTDIR"
 
@@ -76,6 +77,7 @@ CI_IMAGE_TAG=${CI_IMAGE_TAG:-"python-3.8-slim-6"} # see scripts/ci/build_ci_base
 BUILD_OPTIONS=("--platform=linux/amd64" "--target=instance" "--progress=plain")
 TAG="${REGISTRY}instance:$BUILD_IMAGE_TAG"
 MINIMAL_TAG="${REGISTRY}minimal-instance:$BUILD_IMAGE_TAG"
+ALTERNATE_TAG="${REGISTRY_WITHOUT_SLASH}:$BUILD_IMAGE_TAG"
 
 # On CI push the images to the registry
 if [[ -n "${CI:-}" ]]; then
@@ -131,7 +133,8 @@ if [[ -n "${CI:-}" ]]; then
 fi
 
 docker tag "$TAG" "$MINIMAL_TAG"
+docker tag "$TAG" "$ALTERNATE_TAG"
 
 [[ -n "${DOT_ENV_FILENAME:-}" ]] && echo "${DOTENV_VAR_NAME:-IMAGE}=$TAG" > "$DOT_ENV_FILENAME"
 
-popd
\ No newline at end of file
+popd