Added image tagging

scripts/docker_build.py

@@ -49,16 +49,18 @@
 import sys, os, subprocess, time
 os.chdir("..")
 topDir = os.getcwd() + "/sgxwallet"
-print("Starting build", flush=True)
-print("Top directory is:" + topDir, flush=True)
-
-print(sys.argv[1], flush=True);
-#print(sys.argv[2]);
+BRANCH = sys.argv[1];
+if (BRANCH == "develop") :
+   TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+   
 
+print("Starting build for branch " + BRANCH, flush=True)
 
 assert subprocess.call(["pwd"]) == 0;
 
 
 assert subprocess.call(["docker", "build", topDir, "--file", topDir + "/DockerfileSimulation", "--tag",
-                                              "skalenetwork/sgxwalletsim:latest"]) == 0;
+                                              "skalenetwork/sgxwalletsim:" + TAG_POSTFIX]) == 0;
 

scripts/docker_push.py

@@ -53,9 +53,16 @@ print("Starting build push")
 print("Top directory is:" + topDir)
 SCRIPTS_DIR = topDir + "/scripts"
 
+BRANCH = sys.argv[1];
+if (BRANCH == "develop") :
+    TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+
+
 
 #print(sys.argv[1]);
 #print(sys.argv[2]);
 
-assert subprocess.call(["docker", "push", "skalenetwork/sgxwalletsim:latest"]) == 0;
+assert subprocess.call(["docker", "push", "skalenetwork/sgxwalletsim:" + TAG_POSTFIX]) == 0;
 

scripts/docker_test.py

@@ -13,9 +13,15 @@ print("Starting build push")
 print("Top directory is:" + topDir)
 SCRIPTS_DIR = topDir + "/scripts"
 
-print("Running test");
+BRANCH = sys.argv[1];
+if (BRANCH == "develop") :
+    TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+
+print("Running tests for branch " + BRANCH);
 assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data",
-                        "-d", "--network=host", "skalenetwork/sgxwalletsim:latest"]) == 0
+                        "-d", "--network=host", "skalenetwork/sgxwalletsim:" + TAG_POSTFIX]) == 0
 
 time.sleep(5);