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

Feature/skale 2202 versioning
skalenetwork · May 28, 2020 · 2082c22 · 2082c22
2 parents 07c553d + 0eff598
commit 2082c22
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -28,5 +28,5 @@ jobs:
           echo "Version $VERSION"
           export RELEASE=true
           echo "::set-env name=RELEASE::$RELEASE"
-          bash ./scripts/build_image.sh Dockerfile
-          bash ./scripts/publish_image.sh Dockerfile sgxwallet
+          bash ./scripts/build_image.sh Dockerfile sgxwallet
+          bash ./scripts/publish_image.sh sgxwallet
diff --git a/.github/workflows/dockerimagebase.yml b/.github/workflows/dockerimagebase.yml
@@ -31,5 +31,5 @@ jobs:
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
-        bash ./scripts/build_image.sh DockerfileBase
-        bash ./scripts/publish_image.sh DockerfileBase sgxwallet_base
+        bash ./scripts/build_image.sh DockerfileBase sgxwallet_base
+        bash ./scripts/publish_image.sh sgxwallet_base
diff --git a/.github/workflows/dockerimagesim.yml b/.github/workflows/dockerimagesim.yml
@@ -26,7 +26,7 @@ jobs:
         export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
         echo "::set-env name=VERSION::$VERSION"
         echo "Version $VERSION"
-        bash ./scripts/build_image.sh DockerfileSimulation
+        bash ./scripts/build_image.sh DockerfileSimulation sgxwallet_sim
     - name: build container for testing
       run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
     - name: test
@@ -41,7 +41,7 @@ jobs:
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
-        bash ./scripts/publish_image.sh DockerfileSimulation sgxwalletsim
+        bash ./scripts/publish_image.sh sgxwallet_sim
     - name: Create Release
       if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
       id: create_release

diff --git a/scripts/build_image.sh b/scripts/build_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
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/scripts/publish_image.sh b/scripts/publish_image.sh
@@ -2,8 +2,7 @@
 
 set -e
 
-DOCKERFILE=$1
-CONTAINER_NAME=$2
+CONTAINER_NAME=$1
 
 : "${VERSION?Need to set VERSION}"
 : "${BRANCH?Need to set BRANCH}"