Fix on version for docker containers

icgc-dcc · Oct 16, 2018 · 4c5ef54 · 4c5ef54
1 parent 8e79992
commit 4c5ef54
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/workflow/tools/decryption.py b/workflow/tools/decryption.py
@@ -25,9 +25,9 @@
 
 task_start = int(time.time())
 
-decrypt_container = "quay.io/baminou/dckr_ega_decrypt:1.0"
+decrypt_container = "quay.io/baminou/dckr_ega_decrypt"
 
-subprocess.check_output(['docker', 'pull', decrypt_container])
+subprocess.check_output(['docker', 'pull', decrypt_container+':1.0'])
 
 for _file in files:
     try:

diff --git a/workflow/tools/download.py b/workflow/tools/download.py
@@ -29,8 +29,8 @@
 
 task_start = int(time.time())
 
-download_container = "quay.io/baminou/dckr_download_ega_file:1.0"
-subprocess.check_output(['docker', 'pull', download_container])
+download_container = "quay.io/baminou/dckr_download_ega_file"
+subprocess.check_output(['docker', 'pull', download_container+':1.0'])
 
 for _file in files:
     try:

diff --git a/workflow/tools/prepare_metadata_xml.py b/workflow/tools/prepare_metadata_xml.py
@@ -45,7 +45,7 @@
 task_start = int(time.time())
 
 metadata_container = "quay.io/baminou/dckr_prepare_metadata_xml"
-subprocess.check_output(['docker', 'pull', metadata_container])
+subprocess.check_output(['docker', 'pull', metadata_container+':1.0'])
 
 try:
     subprocess.check_output(['docker','run',

diff --git a/workflow/tools/qc_from_aws.py b/workflow/tools/qc_from_aws.py
@@ -24,8 +24,8 @@
 if run:
 
     try:
-        download_container = "quay.io/baminou/dckr_icgc_download:1.0"
-        subprocess.check_output(['docker', 'pull', download_container])
+        download_container = "quay.io/baminou/dckr_icgc_download"
+        subprocess.check_output(['docker', 'pull', download_container+':1.0'])
 
         for file in manifest.get('files'):
             subprocess.check_output(['docker', 'run',

diff --git a/workflow/tools/qc_from_collab.py b/workflow/tools/qc_from_collab.py
@@ -16,8 +16,8 @@
 cwd = os.getcwd()
 
 try:
-    download_container = "quay.io/baminou/dckr_icgc_download:1.0"
-    subprocess.check_output(['docker', 'pull', download_container])
+    download_container = "quay.io/baminou/dckr_icgc_download"
+    subprocess.check_output(['docker', 'pull', download_container+":1.0"])
 
     for file in manifest.get('files'):
         subprocess.check_output(['docker','run',

diff --git a/workflow/tools/upload.py b/workflow/tools/upload.py
@@ -15,10 +15,10 @@
 study_id = task_dict.get('input').get('study_id')
 
 
-upload_container = "quay.io/baminou/dckr_song_upload:1.0"
+upload_container = "quay.io/baminou/dckr_song_upload"
 song_server = os.environ.get('SONG_SERVER_COLLAB')
 
-subprocess.check_output(['docker', 'pull', upload_container])
+subprocess.check_output(['docker', 'pull', upload_container+':1.0'])
 
 subprocess.check_output(['docker','run',
                          '--net=host',

diff --git a/workflow/tools/upload_to_aws.py b/workflow/tools/upload_to_aws.py
@@ -26,10 +26,10 @@
 
 if run:
 
-    upload_container = "quay.io/baminou/dckr_song_upload:1.0"
+    upload_container = "quay.io/baminou/dckr_song_upload"
     song_server = os.environ.get('SONG_SERVER_AWS')
 
-    subprocess.check_output(['docker', 'pull', upload_container])
+    subprocess.check_output(['docker', 'pull', upload_container+':1.0'])
 
     subprocess.check_output(['docker','run',
                              '--net=host',