SKALE-2341 Added tags for older commits

.github/workflows/dockerimagesim.yml

@@ -12,11 +12,11 @@ jobs:
     - name: submodule update
       run: git submodule update --init --recursive
     - name: build
-      run: python3 scripts/docker_build.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_build.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
     - name: test
-      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
     - name: push
-      run: python3 scripts/docker_push.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_push.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
 
 
 

docs/enabling-sgx.md

@@ -49,6 +49,16 @@ that we use in testing.
 Reboot you machine after driver install.  Do `ls /dev/isgx` to check that `isgx` device is properly installed.
 If you do not see the `isgx` device, you need to troubleshoot your driver installation.
 
+If driver installation fails, you can also try installing driver from the 
+Intel github repository. Do 
+ 
+```bash 
+git clone https://github.com/intel/linux-sgx-driver
+```
+
+And then follow instructions in README.md
+
+
 # Troubleshooting Installation
 
 -   If the message  `intel_sgx: SGX is not enabled` appears in `/var/log/syslog`

scripts/docker_build.py

@@ -52,6 +52,7 @@ topDir = os.getcwd() + "/sgxwallet"
 BRANCH = sys.argv[1];
 DOCKER_FILE_NAME = sys.argv[2];
 IMAGE_NAME = sys.argv[3];
+COMMIT_HASH = sys.argv[4]
 if (BRANCH == "develop") :
    TAG_POSTFIX = "latest";
 else :
@@ -67,3 +68,6 @@ assert subprocess.call(["pwd"]) == 0;
 assert subprocess.call(["docker", "build", topDir, "--file", topDir + "/" + DOCKER_FILE_NAME, "--tag",
                                               FULL_IMAGE_NAME]) == 0;
 
+assert subprocess.call(["docker", "tag",  FULL_IMAGE_NAME, IMAGE_NAME + ":" + COMMIT_HASH ]) == 0;
+
+

scripts/docker_push.py

@@ -56,6 +56,8 @@ SCRIPTS_DIR = topDir + "/scripts"
 BRANCH = sys.argv[1];
 DOCKER_FILE_NAME = sys.argv[2];
 IMAGE_NAME = sys.argv[3];
+COMMIT_HASH = sys.argv[4]
+
 if (BRANCH == "develop") :
     TAG_POSTFIX = "latest";
 else :
@@ -63,5 +65,5 @@ else :
 
 FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
 
-assert subprocess.call(["docker", "push", FULL_IMAGE_NAME]) == 0;
+assert subprocess.call(["docker", "push") == 0;
 

scripts/docker_test.py

@@ -38,6 +38,7 @@ SCRIPTS_DIR = topDir + "/scripts"
 BRANCH = sys.argv[1];
 DOCKER_FILE_NAME = sys.argv[2];
 IMAGE_NAME = sys.argv[3];
+COMMIT_HASH = sys.argv[4]
 
 if (BRANCH == "develop") :
     TAG_POSTFIX = "latest";