SKALE-2202 fix build script

scripts/build_and_publish.sh

@@ -2,8 +2,7 @@
 
 set -e
 
-CONTAINER=$1
-DOCKERFILE=$2
+DOCKERFILE=$1
 
 : "${VERSION?Need to set VERSION}"
 : "${BRANCH?Need to set BRANCH}"
@@ -11,15 +10,15 @@ DOCKERFILE=$2
 NAME=sgx
 REPO_NAME=skalenetwork/$NAME
 IMAGE_NAME=$REPO_NAME:$VERSION
-LATEST_IMAGE_NAME=$REPO_NAME-$CONTAINER:$BRANCH-latest
+LATEST_IMAGE_NAME=$REPO_NAME:$BRANCH-latest
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # Build image
 
 echo "Building $IMAGE_NAME..."
-docker build -f "$DIR"/"$DOCKERFILE" -t "$IMAGE_NAME" . || exit $?
-docker tag "$IMAGE_NAME" "$LATEST_IMAGE_NAME"
+docker build -f "${DIR}"/"${DOCKERFILE}" -t "${IMAGE_NAME}" . || exit $?
+docker tag "${IMAGE_NAME}" "${LATEST_IMAGE_NAME}"
 
 echo "========================================================================================="
 echo "Built $IMAGE_NAME"

scripts/calculate_version.sh

@@ -45,7 +45,7 @@ do
     then
         VERSION_NUMBER=4
     fi
-    RESULT_VERSION="$CONTAINER:$VERSION-$LABEL.$VERSION_NUMBER"
+    RESULT_VERSION="$CONTAINER.$VERSION-$LABEL.$VERSION_NUMBER"
     if ! [ $(git tag -l ?$RESULT_VERSION) ]
     then
         echo "$RESULT_VERSION"