From bafd9b04fd705c906098cf57dfae9740ecb48dbe Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Fri, 15 Mar 2024 01:41:27 +0100
Subject: [PATCH] Image publishing script should push `minimal-instance`
 targets into hiveio like also registry.hive.blog. Also fixed
 registry.hive.blog image pathname

---
 .../ci-helpers/build_and_publish_instance.sh    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/ci-helpers/build_and_publish_instance.sh b/scripts/ci-helpers/build_and_publish_instance.sh
index 6528c8676a..118d2f5a99 100755
--- a/scripts/ci-helpers/build_and_publish_instance.sh
+++ b/scripts/ci-helpers/build_and_publish_instance.sh
@@ -102,15 +102,20 @@ docker login -u "$BLOG_REGISTRY_USER" --password-stdin "registry.hive.blog" <<<
 echo "Building an instance image in the source directory $SRC_DIR"
 "$SRC_DIR/scripts/ci-helpers/build_instance.sh" "$CI_COMMIT_TAG" "$SRC_DIR" "$CI_REGISTRY_IMAGE"
 
-echo "Tagging the image built in the previous step as hiveio/${CI_PROJECT_NAME}/minimal-instance:$CI_COMMIT_TAG"
-docker tag "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG" "hiveio/${CI_PROJECT_NAME}/minimal-instance:$CI_COMMIT_TAG"
+HIVEIO_IMG="hiveio/${CI_PROJECT_NAME}:$CI_COMMIT_TAG"
 
-echo "Tagging the image built in the previous step as registry.hive.blog/${CI_PROJECT_NAME}/minimal-instance:$CI_COMMIT_TAG"
-docker tag "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG" "registry.hive.blog/${CI_PROJECT_NAME}/minimal-instance:$CI_COMMIT_TAG"
+echo "Tagging the image built in the previous step as ${HIVEIO_IMG}"
+docker tag "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG" "${HIVEIO_IMG}"
+
+HIVEBLOG_IMG="registry.hive.blog/hive/${CI_PROJECT_NAME}:$CI_COMMIT_TAG"
+
+echo "Tagging the image built in the previous step as ${HIVEBLOG_IMG}"
+docker tag "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG" "${HIVEBLOG_IMG}"
 
 docker images
 
 echo "Pushing instance images"
 docker push "$CI_REGISTRY_IMAGE/instance:$CI_COMMIT_TAG"
-docker push "hiveio/$CI_PROJECT_NAME:$CI_COMMIT_TAG"
-docker push "registry.hive.blog/$CI_PROJECT_NAME:$CI_COMMIT_TAG"
+docker push "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG"
+docker push "${HIVEIO_IMG}"
+docker push "${HIVEBLOG_IMG}"