Add docker tag option (#831)

Add option to specify docker image tag manually to avoid having to update the entire docker image when only the test code is changing and to directly specify a tag during release.

Author: yzheng6

tools/imagesets/imgset.py

@@ -78,14 +78,17 @@ def imgname(self, repomod="", tagmod=""):
             Modifier to nominal Docker tag name
             
         """
-        if tagmod != "":
-            tagmod = "-" + tagmod
-        try:
-            gitmod = '-' + subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode('ascii').strip()
-        except:
-            gitmod = ""
-        return f"nisar-adt/isce3{repomod}:{self.name}{tagmod}" \
-               + f"-{getpass.getuser()}{gitmod}" 
+        if self.imgtag:
+            return f"nisar-adt/isce3{repomod}:{self.imgtag}"
+        else:
+            if tagmod != "":
+                tagmod = "-" + tagmod
+            try:
+                gitmod = '-' + subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode('ascii').strip()
+            except:
+                gitmod = ""
+            return f"nisar-adt/isce3{repomod}:{self.name}{tagmod}" \
+                   + f"-{getpass.getuser()}{gitmod}" 
 
     def docker_run(self, img, cmd):
         runcmd = f"{docker} run {self.run_args} --rm -i {self.tty} " \
@@ -98,7 +101,7 @@ def docker_run_dev(self, cmd):
         """
         self.docker_run("dev", cmd)
 
-    def __init__(self, name, *, projblddir, printlog=False):
+    def __init__(self, name, *, projblddir, printlog=False, imgtag=None):
         """
         A set of docker images for building and testing isce3/nisar distributables.
         
@@ -113,6 +116,7 @@ def __init__(self, name, *, projblddir, printlog=False):
         """
         self.name = name
         self.projblddir = projblddir
+        self.imgtag = imgtag   
         self.datadir = projblddir + "/workflow_testdata_tmp/data"
         self.testdir = projblddir + "/workflow_testdata_tmp/test"
         self.build_args = f'''
@@ -143,7 +147,7 @@ def __init__(self, name, *, projblddir, printlog=False):
             self.run_args += " --runtime=nvidia"
 
         logging.basicConfig(format='', level=logging.INFO)
-        self.printlog = printlog    
+        self.printlog = printlog 
 
     def cmake_args(self):
         return [f"-D{key}={value}" for key, value in self.cmake_defs.items()] \

tools/run.py

@@ -64,5 +64,6 @@ def run(*, steps, imgset, **kwargs):
     parser.add_argument("-i", "--imgset", default="centos7conda")
     parser.add_argument("-B", "--projblddir", default=f"{projsrcdir}/build-docker")
     parser.add_argument("-p", "--printlog", action='store_true')
+    parser.add_argument("-t", "--imgtag", default=None)    
     parser.add_argument("steps", nargs="+")
     run(**vars(parser.parse_args()))