SKALE-2202 build and test for sim mode

.github/workflows/dockerimagesim.yml

@@ -13,13 +13,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: submodule update
       run: git submodule update --init --recursive
-    - name: build
-      run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
-    - name: test
-      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
-    - name: deploy docker image
-      #if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
-      run : |
+    - name: init enviroment variables:
+      run: |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
         export VERSION=$(cat VERSION)
@@ -29,7 +24,15 @@ jobs:
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
-        bash ./scripts/build_and_publish.sh DockerfileSimulation
+        bash ./scripts/build_image.sh DockerfileSimulation
+    - name: build
+      run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
+    - name: test
+      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+    - name: deploy docker image
+      #if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
+      run : |
+        bash ./scripts/publish_image.sh DockerfileSimulation
     - name: Create Release
       if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
       id: create_release

scripts/build_and_publish.sh → scripts/build_image.sh

@@ -21,14 +21,4 @@ docker build -f "${DIR}"/../"${DOCKERFILE}" -t "${IMAGE_NAME}" . || exit $?
 docker tag "${IMAGE_NAME}" "${LATEST_IMAGE_NAME}"
 
 echo "========================================================================================="
-echo "Built $IMAGE_NAME"
-
+echo "Built $IMAGE_NAME"
\ No newline at end of file
-# Publish image
-
-: "${DOCKER_USERNAME?Need to set DOCKER_USERNAME}"
-: "${DOCKER_PASSWORD?Need to set DOCKER_PASSWORD}"
-
-echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-
-docker push "$IMAGE_NAME" || exit $?
-docker push "$LATEST_IMAGE_NAME" || exit $?

scripts/calculate_version.sh

@@ -43,7 +43,7 @@ for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
     if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" -le 4 ]
     then
-        VERSION_NUMBER=4
+        VERSION_NUMBER=123
     fi
     RESULT_VERSION="$CONTAINER.$VERSION-$LABEL.$VERSION_NUMBER"
     if ! [ $(git tag -l ?$RESULT_VERSION) ]

scripts/publish_image.sh

+#!/usr/bin/env bash
+
+set -e
+
+DOCKERFILE=$1
+
+: "${VERSION?Need to set VERSION}"
+: "${BRANCH?Need to set BRANCH}"
+
+NAME=sgx
+REPO_NAME=skalenetwork/$NAME
+IMAGE_NAME=$REPO_NAME:$VERSION
+LATEST_IMAGE_NAME=$REPO_NAME:$BRANCH-latest
+
+: "${DOCKER_USERNAME?Need to set DOCKER_USERNAME}"
+: "${DOCKER_PASSWORD?Need to set DOCKER_PASSWORD}"
+
+echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+
+docker push "$IMAGE_NAME" || exit $?
+docker push "$LATEST_IMAGE_NAME" || exit $?