Merge branch 'develop' into bug/update-dependencies

.github/workflows/dockerimage.yml

-name: Build, test and push sgxwallet container
-
+name: Build, test and push SGX container
 on: [push]
-
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
-
     steps:
       - name: Login to docker
         env:
@@ -16,8 +11,8 @@ jobs:
       - uses: actions/checkout@v1
       - name: submodule update
         run: git submodule update --init --recursive
-      - name: Build the Docker image
-        run: docker build . --file Dockerfile --tag  skalenetwork/sgxwallet:latest
-      - name: push docker image
-        run:  docker push skalenetwork/sgxwallet:latest
+      - name: build
+        run: python3 scripts/docker_build.py ${GITHUB_REF##*/} Dockerfile sgxwallet
+      - name: push
+        run: python3 scripts/docker_push.py ${GITHUB_REF##*/} Dockerfile sgxwallet
 

.github/workflows/dockerimagesim.yml

@@ -16,7 +16,7 @@ jobs:
     - name: test
       run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
     - name: push
-      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_push.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
 
 
 

scripts/docker_build.py

@@ -56,12 +56,14 @@ if (BRANCH == "develop") :
    TAG_POSTFIX = "latest";
 else :
     TAG_POSTFIX = "latest_commit"
-   
+
+
+FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
 
 print("Starting build for branch " + BRANCH, flush=True)
 
 assert subprocess.call(["pwd"]) == 0;
 
 assert subprocess.call(["docker", "build", topDir, "--file", topDir + "/" + DOCKER_FILE_NAME, "--tag",
-                                              "skalenetwork/" + IMAGE_NAME + ":" + TAG_POSTFIX]) == 0;
+                                              FULL_IMAGE_NAME]) == 0;
 

scripts/docker_push.py

@@ -61,10 +61,7 @@ if (BRANCH == "develop") :
 else :
     TAG_POSTFIX = "latest_commit"
 
+FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
 
-
-#print(sys.argv[1]);
-#print(sys.argv[2]);
-
-assert subprocess.call(["docker", "push", "skalenetwork/" + IMAGE_NAME + ":" + TAG_POSTFIX]) == 0;
+assert subprocess.call(["docker", "push", FULL_IMAGE_NAME]) == 0;
 

scripts/docker_test.py

@@ -22,7 +22,12 @@ if (BRANCH == "develop") :
 else :
     TAG_POSTFIX = "latest_commit"
 
+FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
+
 print("Running tests for branch " + BRANCH);
+
+assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0;
+
 assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data",
                         "-d", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX]) == 0