Include context specific name in the latest tag for stable images

.gitlab-ci.yml

@@ -199,7 +199,7 @@ build_and_push_clive_testnet_image:
     BUILD_INSTANCE_ARGS: "--image-path-suffix=-${CI_COMMIT_REF_NAME}"
   after_script:
     - source docker_image_name.env  # required: https://gitlab.syncad.com/hive/clive/-/jobs/622075
-    - export LATEST_IMAGE_TAG="${CLIVE_IMAGE_PATH}:latest"
+    - export LATEST_IMAGE_TAG="${CLIVE_IMAGE_PATH}:${CLIVE_IMAGE_TAG_PREFIX}-latest"
     - echo Tagging ${CLIVE_IMAGE_NAME} with additional ${LATEST_IMAGE_TAG}
     - docker tag ${CLIVE_IMAGE_NAME} ${LATEST_IMAGE_TAG}
     - docker push ${LATEST_IMAGE_TAG}

scripts/ci-helpers/build_instance.sh

@@ -90,8 +90,9 @@ pushd "$SRCROOTDIR"
 
 export DOCKER_BUILDKIT=1
 
-CLIVE_IMAGE_PATH="${REGISTRY}${IMAGE_TAG_PREFIX}instance${IMAGE_PATH_SUFFIX}"
-CLIVE_IMAGE_NAME="${CLIVE_IMAGE_PATH}:${IMAGE_TAG_PREFIX}instance-${BUILD_IMAGE_TAG}"
+CLIVE_IMAGE_TAG_PREFIX="${IMAGE_TAG_PREFIX}instance"
+CLIVE_IMAGE_PATH="${REGISTRY}${CLIVE_IMAGE_TAG_PREFIX}${IMAGE_PATH_SUFFIX}"
+CLIVE_IMAGE_NAME="${CLIVE_IMAGE_PATH}:${CLIVE_IMAGE_TAG_PREFIX}-${BUILD_IMAGE_TAG}"
 
 docker build --target=${DOCKER_TARGET} \
   --build-arg CI_REGISTRY_IMAGE=$REGISTRY \
@@ -102,5 +103,6 @@ docker build --target=${DOCKER_TARGET} \
 
 popd
 
-echo "CLIVE_IMAGE_PATH=${CLIVE_IMAGE_PATH}" > docker_image_name.env
+echo "CLIVE_IMAGE_TAG_PREFIX=${CLIVE_IMAGE_TAG_PREFIX}" > docker_image_name.env
+echo "CLIVE_IMAGE_PATH=${CLIVE_IMAGE_PATH}" >> docker_image_name.env
 echo "CLIVE_IMAGE_NAME=${CLIVE_IMAGE_NAME}" >> docker_image_name.env