update runners to 0.3.0 beta

ncbi · Nov 22, 2022 · 1865766 · 1865766
1 parent eb7c7f7
commit 1865766
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dist/run_fcsadaptor.sh b/dist/run_fcsadaptor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_NAME=$0
-DEFAULT_VERSION="0.2.3"
+DEFAULT_VERSION="0.3.0"
 DOCKER_IMAGE=ncbi/fcs-adaptor:${DEFAULT_VERSION}
 SINGULARITY_IMAGE=""
 CONTAINER_ENGINE="docker"

diff --git a/dist/run_fcsgx.py b/dist/run_fcsgx.py
@@ -13,7 +13,7 @@
 
 CONTAINER = "run_gx"
 DEFAULT_CONTAINER_DB = "/app/db/gxdb"
-DEFAULT_VERSION = "0.2.3"
+DEFAULT_VERSION = "0.3.0"
 DEFAULT_DOCKER_IMAGE = f"ncbi/fcs-gx:{DEFAULT_VERSION}"
 DEFAULT_SINGULARITY_IMAGE = f"fcs-gx.{DEFAULT_VERSION}.sif"
 # FILE_MANIFEST = "sing-image.manifest"
@@ -116,6 +116,8 @@ def run_retrieve_db(self):
             str(self.args.container_db / gxdb_name),
             *extra_db_args,
         ]
+        if container_engine == "docker":
+            retrieve_db_args.insert(2, "--rm")
         self.safe_exec(retrieve_db_args)
 
     def run_gx(self):
@@ -159,6 +161,8 @@ def run_gx(self):
             "--split-fasta=" + ("T" if self.args.split_fasta else "F"),
         ]
 
+        if container_engine == "docker":
+            docker_args.insert(2, "--rm")
         if self.args.out_basename:
             docker_args.extend(["--out-basename", self.args.out_basename])
         if self.args.blast_div:
@@ -195,6 +199,9 @@ def run_verify_checksums(self):
             str(self.args.container_db / gxdb_name),
             "--debug",
         ]
+        if container_engine == "docker":
+            docker_args.insert(2, "--rm")
+
         self.safe_exec(docker_args)
 
     def run(self):