Removed word instance from image names

Author: Forinil

.gitignore

@@ -140,3 +140,6 @@ programs/beekeeper/beekeeper_wasm/storage_root-node
 venv
 .venv
 .cache
+
+# Other
+block_log.env

.gitlab-ci.yaml

@@ -198,18 +198,18 @@ mirrornet_node_build:
       source docker_image_name.env
       echo "Pushing hived image for commits on develop, master and tagged"
       docker images
-      IMAGE_NAME_PREFIX="$CI_REGISTRY_IMAGE/mirrornet-instance:"
+      IMAGE_NAME_PREFIX="$CI_REGISTRY_IMAGE/mirrornet:"
       if [[ "$CI_COMMIT_BRANCH" == "develop" ]];
       then
-        docker tag $HIVED_IMAGE_NAME_INSTANCE ${IMAGE_NAME_PREFIX}latest
+        docker tag $HIVED_INSTANCE ${IMAGE_NAME_PREFIX}latest
         docker push ${IMAGE_NAME_PREFIX}latest
       elif [[ "$CI_COMMIT_BRANCH" == "master" ]];
       then
-        docker tag $HIVED_IMAGE_NAME_INSTANCE ${IMAGE_NAME_PREFIX}stable
+        docker tag $HIVED_INSTANCE ${IMAGE_NAME_PREFIX}stable
         docker push ${IMAGE_NAME_PREFIX}stable
       elif [[ -n "$CI_COMMIT_TAG" ]];
       then
-        docker tag $HIVED_IMAGE_NAME_INSTANCE ${IMAGE_NAME_PREFIX}${CI_COMMIT_TAG}
+        docker tag $HIVED_INSTANCE ${IMAGE_NAME_PREFIX}${CI_COMMIT_TAG}
         docker push ${IMAGE_NAME_PREFIX}${CI_COMMIT_TAG}
       fi
 

Dockerfile

@@ -1,5 +1,5 @@
 # Base docker file having defined environment for build and run of hived instance.
-# Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_images.sh and run it. Then push images to registry
+# Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_image.sh and run it. Then push images to registry
 # To be started from cloned haf source directory.
 ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
 ARG CI_IMAGE_TAG=ubuntu24.04-1
@@ -101,7 +101,7 @@ RUN \
 # This prevents crash if testnet is not build
 RUN mkdir -p /home/hived_admin/build/libraries/vendor/rocksdb/tools
 
-FROM ${CI_REGISTRY_IMAGE}runtime:$CI_IMAGE_TAG AS base_instance
+FROM ${CI_REGISTRY_IMAGE}runtime:$CI_IMAGE_TAG AS base
 
 ARG BUILD_TIME
 ARG GIT_COMMIT_SHA
@@ -184,7 +184,7 @@ EXPOSE ${HTTP_PORT}
 
 ENTRYPOINT [ "/home/hived_admin/docker_entrypoint.sh" ]
 
-FROM ${CI_REGISTRY_IMAGE}${IMAGE_TAG_PREFIX}base_instance:${BUILD_IMAGE_TAG} AS instance
+FROM ${CI_REGISTRY_IMAGE}${IMAGE_TAG_PREFIX}base:${BUILD_IMAGE_TAG} AS instance
 
 #p2p service
 EXPOSE ${P2P_PORT}
@@ -200,4 +200,4 @@ EXPOSE ${CLI_WALLET_PORT}
 # the current `instance` isn't bad.  Our current focus is shrinking the haf image size,
 # and since we use the same scripts for building both hive and haf, we need a
 # 'minimal-instance' target here to match the one in haf.  Don't use this.
-FROM instance AS minimal-instance
+FROM instance AS minimal

block_log.env

@@ -48,11 +48,11 @@ We ship a Dockerfile.
 
 - `--export-binaries=PATH` - extracts the built binaries from the created docker image
 
-The example command above will build an image named `registry.gitlab.syncad.com/hive/hive/instance:my-tag`
+The example command above will build an image named `registry.gitlab.syncad.com/hive/hive:my-tag`
 
 To run the given image, you can use a helper script:
 
-    ../hive/scripts/run_hived_img.sh registry.gitlab.syncad.com/hive/hive/instance:my-tag --name=hived-instance --data-dir=/home/hive/datadir --shared-file-dir=/home/hive/datadir
+    ../hive/scripts/run_hived_img.sh registry.gitlab.syncad.com/hive/hive:my-tag --name=hived-instance --data-dir=/home/hive/datadir --shared-file-dir=/home/hive/datadir
 
 ## Building native binaries on Ubuntu 22.04 LTS
 

doc/building.md

@@ -48,8 +48,8 @@ print_help () {
     echo
 }
 
-REGISTRY="registry.gitlab.syncad.com/hive/hive/"
-HIVED_IMAGE_NAME="instance"
+REGISTRY="registry.gitlab.syncad.com/hive/hive"
+HIVED_IMAGE_NAME=""
 HIVED_IMAGE_TAG=""
 
 HIVED_SOURCE_DIR=""
@@ -138,7 +138,7 @@ process_option_file() {
 
   mapfile -t <"$option_file" READ_OPTIONS
 #  echo "Read options: ${READ_OPTIONS[@]}"
-  for o in ${READ_OPTIONS[@]}; do
+  for o in "${READ_OPTIONS[@]}"; do
     [[ $o =~ ^#.* ]] && continue
 #    echo "Processing a file option: $o"
     process_option "$o"
@@ -154,10 +154,13 @@ do_clone() {
 
 prepare_data_directory() {
   local data_dir=${1}
-  local image_name=${2}
+  local _image_name=${2}
   local block_log_base_url=${3}
 
-  mkdir --mode=777 -p "${data_dir}/blockchain"
+  # --mode only applies to the blockchain directory when combined with -p.
+  # Let's make that explicit to avoid confusion.
+  mkdir -p "${data_dir}"
+  mkdir --mode=777 "${data_dir}/blockchain"
 
   if [ "${DOWNLOAD_BLOCK_LOG}" -eq 1 ];
   then
@@ -166,15 +169,15 @@ prepare_data_directory() {
       echo "block_log file exists at location: '${data_dir}/blockchain/' - skipping download."
     else
       echo "Downloading a block_log file to the location: '${data_dir}/blockchain/block_log'."
-      wget -O "${data_dir}/blockchain/block_log" ${block_log_base_url}/block_log
+      wget -O "${data_dir}/blockchain/block_log" "${block_log_base_url}/block_log"
     fi
 
     if [ -f "${data_dir}/blockchain/block_log.artifacts" ];
     then
       echo "block_log.artifacts file exists at location: '${data_dir}/blockchain/' - skipping download."
     else
       echo "Downloading a block_log.artifacts file to the location: '${data_dir}/blockchain/block_log.artifacts'."
-      wget -O "${data_dir}/blockchain/block_log.artifacts" ${block_log_base_url}/block_log.artifacts
+      wget -O "${data_dir}/blockchain/block_log.artifacts" "${block_log_base_url}/block_log.artifacts"
     fi
   fi
 
@@ -193,9 +196,9 @@ while [ $# -gt 0 ]; do
   shift
 done
 
-TST_IMGTAG=${HIVED_IMAGE_TAG:?"Missing arg #1 to specify image tag"}
+_TST_IMGTAG=${HIVED_IMAGE_TAG:?"Missing arg #1 to specify image tag"}
 
-TST_DATADIR=${HIVED_DATADIR:?"Missing --data-dir option to specify host directory where hived node data will be stored"}
+_TST_DATADIR=${HIVED_DATADIR:?"Missing --data-dir option to specify host directory where hived node data will be stored"}
 
 
 if [ -z "${HIVED_SOURCE_DIR}" ];
@@ -213,13 +216,14 @@ fi
 echo "Loading exchange-instance default option list from file: ${HIVED_SOURCE_DIR}/scripts/exchange_instance.conf"
 process_option_file "${HIVED_SOURCE_DIR}/scripts/exchange_instance.conf"
 
+# shellcheck source=ci-helpers/docker_image_utils.sh
 source "${HIVED_SOURCE_DIR}/scripts/ci-helpers/docker_image_utils.sh"
 
 image_exists=0
 
-docker_image_exists "${HIVED_IMAGE_NAME}" "${HIVED_IMAGE_TAG}" "${REGISTRY}" image_exists 0
+img_name=$( build_image_name "${HIVED_IMAGE_TAG}" "${REGISTRY}" "${HIVED_IMAGE_NAME}" )
 
-img_name=$( build_image_name "${HIVED_IMAGE_NAME}" "${HIVED_IMAGE_TAG}" "${REGISTRY}" )
+docker_image_exists "${img_name}" image_exists 0
 
 if [ "$image_exists" -eq 1 ];
 then
@@ -228,7 +232,7 @@ else
   "${HIVED_SOURCE_DIR}/scripts/ci-helpers/build_instance.sh" "${HIVED_IMAGE_TAG}" "${HIVED_SOURCE_DIR}" "${REGISTRY}"
 fi
 
-prepare_data_directory "${HIVED_DATADIR}" ${img_name} ${BLOCK_LOG_BASE_URL}
+prepare_data_directory "${HIVED_DATADIR}" "${img_name}" "${BLOCK_LOG_BASE_URL}"
 
-"${HIVED_SOURCE_DIR}/scripts/run_hived_img.sh" ${img_name} --docker-option="-p 8093:8093" ${IMPLICIT_SHM_DIR} "${RUN_HIVED_IMG_ARGS[@]}"
+"${HIVED_SOURCE_DIR}/scripts/run_hived_img.sh" "${img_name}" --docker-option="-p 8093:8093" "${IMPLICIT_SHM_DIR}" "${RUN_HIVED_IMG_ARGS[@]}"
 

scripts/build_and_setup_exchange_instance.sh

@@ -7,7 +7,7 @@ print_help () {
 cat <<EOF
 Usage: $0 OPTION[=VALUE]...
 
-Script for building Docker image of Hive instance and pushingit to GitLab registry and to Docker Hub
+Script for building Docker image of Hive instance and pushing it to GitLab registry and to Docker Hub
 All options (except '--help') are required
 OPTIONS:
   --registry-user=USERNAME      Docker registry user
@@ -115,22 +115,21 @@ 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" "${BUILD_INSTANCE_ADDITIONAL_ARGS[@]}"
 
 echo "Tagging the image built in the previous step as ${CI_REGISTRY_IMAGE}"
-docker tag "$CI_REGISTRY_IMAGE/minimal-instance:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+docker tag "$CI_REGISTRY_IMAGE/minimal:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
 
 HIVEIO_IMG="hiveio/${CI_PROJECT_NAME}:$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}"
+docker tag "$CI_REGISTRY_IMAGE/minimal:$CI_COMMIT_TAG" "${HIVEIO_IMG}"
 
 HIVEBLOG_IMG="registry-upload.hive.blog/${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 tag "$CI_REGISTRY_IMAGE/minimal:$CI_COMMIT_TAG" "${HIVEBLOG_IMG}"
 
 docker images
 
 echo "Pushing instance images"
-docker push "$CI_REGISTRY_IMAGE/instance:$CI_COMMIT_TAG"
 docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
 docker push "${HIVEIO_IMG}"
 docker push "${HIVEBLOG_IMG}"

scripts/ci-helpers/build_and_publish_instance.sh

@@ -2,22 +2,22 @@
 
 set -e
 
-REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive/}
+REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive}
 CI_IMAGE_TAG=ubuntu24.04-1
 
 docker build --progress=plain --target=runtime \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
   --build-arg BUILD_IMAGE_TAG=$CI_IMAGE_TAG \
-  --tag "${REGISTRY}runtime:$CI_IMAGE_TAG" --file Dockerfile .
+  --tag "${REGISTRY}/runtime:$CI_IMAGE_TAG" --file Dockerfile .
 
 
 docker build --progress=plain --target=minimal-runtime \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
   --build-arg BUILD_IMAGE_TAG=$CI_IMAGE_TAG \
-  --tag "${REGISTRY}minimal-runtime:$CI_IMAGE_TAG" --file Dockerfile .
+  --tag "${REGISTRY}/minimal-runtime:$CI_IMAGE_TAG" --file Dockerfile .
 
 
 docker build --progress=plain --target=ci-base-image \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
   --build-arg BUILD_IMAGE_TAG=$CI_IMAGE_TAG \
-  --tag "${REGISTRY}ci-base-image:$CI_IMAGE_TAG" --file Dockerfile .
+  --tag "${REGISTRY}/ci-base-image:$CI_IMAGE_TAG" --file Dockerfile .

scripts/ci-helpers/build_ci_base_image.sh

@@ -39,12 +39,12 @@ while [ $# -gt 0 ]; do
         case $type in
           "testnet"*)
             BUILD_HIVE_TESTNET=ON
-            IMAGE_TAG_PREFIX=testnet-
+            IMAGE_TAG_PREFIX=testnet
             ;;
           "mirrornet"*)
             BUILD_HIVE_TESTNET=OFF
             HIVE_CONVERTER_BUILD=ON
-            IMAGE_TAG_PREFIX=mirrornet-
+            IMAGE_TAG_PREFIX=mirrornet
             ;;
           "mainnet"*)
             BUILD_HIVE_TESTNET=OFF
@@ -90,9 +90,6 @@ _TST_IMGTAG=${BUILD_IMAGE_TAG:?"Missing arg #1 to specify built image tag"}
 _TST_SRCDIR=${SRCROOTDIR:?"Missing arg #2 to specify source directory"}
 _TST_REGISTRY=${REGISTRY:?"Missing arg #3 to specify target container registry"}
 
-# Supplement a registry path by trailing slash (if needed)
-[[ "${REGISTRY}" != */ ]] && REGISTRY="${REGISTRY}/"
-
 echo "Moving into source root directory: ${SRCROOTDIR}"
 
 pushd "$SRCROOTDIR"
@@ -136,8 +133,8 @@ fi
 
 echo -e "\nBuilding base instance image...\n"
 
-docker build --target=base_instance \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" \
+docker build --target=base \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" \
   --build-arg BUILD_HIVE_TESTNET="$BUILD_HIVE_TESTNET" \
   --build-arg HIVE_CONVERTER_BUILD="$HIVE_CONVERTER_BUILD" \
   --build-arg BUILD_IMAGE_TAG="$BUILD_IMAGE_TAG" \
@@ -148,14 +145,14 @@ docker build --target=base_instance \
   --build-arg GIT_LAST_COMMITTER="$GIT_LAST_COMMITTER" \
   --build-arg GIT_LAST_COMMIT_DATE="$GIT_LAST_COMMIT_DATE" \
   --build-arg HIVE_SUBDIR="$HIVE_SUBDIR" \
-  --build-arg IMAGE_TAG_PREFIX="$IMAGE_TAG_PREFIX" \
-  --tag "${REGISTRY}${IMAGE_TAG_PREFIX}base_instance:${BUILD_IMAGE_TAG}" \
+  --build-arg IMAGE_TAG_PREFIX="${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}" \
+  --tag "${REGISTRY}/${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}base:${BUILD_IMAGE_TAG}" \
   --file Dockerfile "$SOURCE_DIR"
 
 echo -e "\nDone!\nBuilding instance image...\n"
 
 docker build --target=instance \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" \
   --build-arg BUILD_HIVE_TESTNET=$BUILD_HIVE_TESTNET \
   --build-arg HIVE_CONVERTER_BUILD=$HIVE_CONVERTER_BUILD \
   --build-arg BUILD_IMAGE_TAG="$BUILD_IMAGE_TAG" \
@@ -166,14 +163,14 @@ docker build --target=instance \
   --build-arg GIT_LAST_COMMITTER="$GIT_LAST_COMMITTER" \
   --build-arg GIT_LAST_COMMIT_DATE="$GIT_LAST_COMMIT_DATE" \
   --build-arg HIVE_SUBDIR="$HIVE_SUBDIR" \
-  --build-arg IMAGE_TAG_PREFIX="$IMAGE_TAG_PREFIX" \
-  --tag "${REGISTRY}${IMAGE_TAG_PREFIX}instance:${BUILD_IMAGE_TAG}" \
+  --build-arg IMAGE_TAG_PREFIX="${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}" \
+  --tag "${REGISTRY}${IMAGE_TAG_PREFIX:+/$IMAGE_TAG_PREFIX}:${BUILD_IMAGE_TAG}" \
   --file Dockerfile "$SOURCE_DIR"
 
 echo -e "\nDone!\nBuilding minimal instance image...\n"
 
-docker build --target=minimal-instance \
-  --build-arg CI_REGISTRY_IMAGE="$REGISTRY" \
+docker build --target=minimal \
+  --build-arg CI_REGISTRY_IMAGE="$REGISTRY/" \
   --build-arg BUILD_HIVE_TESTNET=$BUILD_HIVE_TESTNET \
   --build-arg HIVE_CONVERTER_BUILD=$HIVE_CONVERTER_BUILD \
   --build-arg BUILD_IMAGE_TAG="$BUILD_IMAGE_TAG" \
@@ -184,18 +181,16 @@ docker build --target=minimal-instance \
   --build-arg GIT_LAST_COMMITTER="$GIT_LAST_COMMITTER" \
   --build-arg GIT_LAST_COMMIT_DATE="$GIT_LAST_COMMIT_DATE" \
   --build-arg HIVE_SUBDIR="$HIVE_SUBDIR" \
-  --build-arg IMAGE_TAG_PREFIX="$IMAGE_TAG_PREFIX" \
-  --tag "${REGISTRY}${IMAGE_TAG_PREFIX}minimal-instance:${BUILD_IMAGE_TAG}" \
+  --build-arg IMAGE_TAG_PREFIX="${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}" \
+  --tag "${REGISTRY}/${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}minimal:${BUILD_IMAGE_TAG}" \
   --file Dockerfile "$SOURCE_DIR"
 
-# rm -rf base_instance.tar base_instance
-
 echo -e "\nDone!\n"
 
 popd
 
 if [ -n "${EXPORT_PATH}" ];
 then
-  "$SCRIPTPATH/export-data-from-docker-image.sh" "${REGISTRY}${IMAGE_TAG_PREFIX}base_instance:${BUILD_IMAGE_TAG}" "${EXPORT_PATH}"
+  "$SCRIPTPATH/export-data-from-docker-image.sh" "${REGISTRY}/${IMAGE_TAG_PREFIX:+$IMAGE_TAG_PREFIX-}base:${BUILD_IMAGE_TAG}" "${EXPORT_PATH}"
 fi
 

scripts/ci-helpers/build_instance.sh

@@ -1,35 +1,25 @@
 #! /bin/bash
 
 function build_image_name() {
-  local image=$1
-  local tag=$2
-  local registry=${3}
-  echo "${registry}${image}:${tag}"
+  local tag=${1:?"Missing tag"}
+  local registry=${2:?"Missing registry"}
+  local image=${3:-}
+  # If image is not empty then it needs to be preceeded by a slash 
+  echo "${registry}${image:+/$image}:${tag}"
 }
 
 function build_image_registry_path() {
-  local image=$1
-  local tag=$2
-  local registry=${3}
-  echo "${registry}${image}"
-}
-
-function build_image_registry_tag() {
-  local image=$1
-  local tag=$2
-  local registry=${3}
-  echo "${tag}"
+  local tag=${1:?"Missing tag"}
+  local registry=${2:?"Missing registry"}
+  local image=${3:-}
+  # If image is not empty then it needs to be preceeded by a slash 
+  echo "${registry}${image:+/$image}"
 }
 
 function docker_image_exists() {
-  local image=$1
-  local tag=$2
-  local registry=${3}
-  local  __resultvar=${4:?"Missing required retval variable name"}
-  local look_to_registry=${5:-1}
-
-  local imgname
-  imgname=$( build_image_name "$image" "$tag" "$registry" )
+  local imgname=${1:?"Missing image name"}
+  local  __resultvar=${2:?"Missing required retval variable name"}
+  local look_to_registry=${3:-1}
 
   local result=0