Merge branch 'develop' into SKALE-1880-FIX-WARNINGS

.github/workflows/dockerimage.yml

@@ -23,26 +23,10 @@ jobs:
           echo "Branch $BRANCH"
           export VERSION=$(cat VERSION)
           echo "Version $VERSION"
-          export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwallet)
+          export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
           echo "::set-env name=VERSION::$VERSION"
           echo "Version $VERSION"
           export RELEASE=true
           echo "::set-env name=RELEASE::$RELEASE"
           bash ./scripts/build_image.sh Dockerfile
-          bash ./scripts/publish_image.sh Dockerfile
-      - name: Create Release
-        if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
-        id: create_release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ env.VERSION }}
-          release_name: Release ${{ env.VERSION }}
-          body: |
-            Changes in this Release
-            - First Change
-            - Second Change
-          draft: false
-          prerelease: true
-
+          bash ./scripts/publish_image.sh Dockerfile sgxwallet
\ No newline at end of file

.github/workflows/dockerimagebase.yml

@@ -26,25 +26,10 @@ jobs:
         echo "Branch $BRANCH"
         export VERSION=$(cat VERSION)
         echo "Version $VERSION"
-        export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwallet_base)
+        export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
         echo "::set-env name=VERSION::$VERSION"
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
         bash ./scripts/build_image.sh DockerfileBase
-        bash ./scripts/publish_image.sh DockerfileBase
-    - name: Create Release
-      if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
-      id: create_release
-      uses: actions/create-release@latest
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-      with:
-        tag_name: ${{ env.VERSION }}
-        release_name: Release ${{ env.VERSION }}
-        body: |
-          Changes in this Release
-          - First Change
-          - Second Change
-        draft: false
-        prerelease: true
\ No newline at end of file
+        bash ./scripts/publish_image.sh DockerfileBase sgxwallet_base
\ No newline at end of file

.github/workflows/dockerimagesim.yml

@@ -23,7 +23,7 @@ jobs:
         echo "Branch $BRANCH"
         export VERSION=$(cat VERSION)
         echo "Version $VERSION"
-        export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwalletsim)
+        export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
         echo "::set-env name=VERSION::$VERSION"
         echo "Version $VERSION"
         bash ./scripts/build_image.sh DockerfileSimulation
@@ -41,7 +41,7 @@ jobs:
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
-        bash ./scripts/publish_image.sh DockerfileSimulation
+        bash ./scripts/publish_image.sh DockerfileSimulation sgxwalletsim
     - name: Create Release
       if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
       id: create_release

scripts/calculate_version.sh

@@ -2,7 +2,6 @@
 
 BRANCH=$1
 VERSION=$2
-CONTAINER=$3
 
 if [ -z "$BRANCH" ]
 then
@@ -16,12 +15,6 @@ then
       exit 1
 fi
 
-if [ -z "$CONTAINER" ]
-then
-      echo "The base container is not set."
-      exit 1
-fi
-
 git fetch --tags
 
 if [ "$BRANCH" = "master" ]
@@ -45,7 +38,7 @@ do
     then
         VERSION_NUMBER=4
     fi
-    RESULT_VERSION="$CONTAINER.$VERSION-$LABEL.$VERSION_NUMBER"
+    RESULT_VERSION="$VERSION-$LABEL.$VERSION_NUMBER"
     if ! [ $(git tag -l ?$RESULT_VERSION) ]
     then
         echo "$RESULT_VERSION"

scripts/publish_image.sh

@@ -3,13 +3,14 @@
 set -e
 
 DOCKERFILE=$1
+CONTAINER_NAME=$2
 
 : "${VERSION?Need to set VERSION}"
 : "${BRANCH?Need to set BRANCH}"
 
 NAME=sgx
 REPO_NAME=skalenetwork/$NAME
-IMAGE_NAME=$REPO_NAME:$VERSION
+IMAGE_NAME=$REPO_NAME.$CONTAINER_NAME:$VERSION
 LATEST_IMAGE_NAME=$REPO_NAME:$BRANCH-latest
 
 : "${DOCKER_USERNAME?Need to set DOCKER_USERNAME}"