Merge pull request #88 from skalenetwork/feature/SKALE-2202-versioning

SKALE-2202 fix script

scripts/build_and_publish.sh

@@ -11,12 +11,14 @@ 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-$CONTAINER:$BRANCH-latest
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # Build image
 
 echo "Building $IMAGE_NAME..."
-docker build -f "$DOCKERFILE" -t "$IMAGE_NAME" || exit $?
+docker build -f "$DIR"/"$DOCKERFILE" -t "$IMAGE_NAME" . || exit $?
 docker tag "$IMAGE_NAME" "$LATEST_IMAGE_NAME"
 
 echo "========================================================================================="

scripts/calculate_version.sh

@@ -41,7 +41,7 @@ fi
 
 for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
-    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" < 4 ]
+    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" -le 4 ]
     then
         VERSION_NUMBER=4
     fi