Merge pull request #29 from icgc-argo/[email protected]

[release]
icgc-argo · Feb 22, 2021 · f42a10a · f42a10a
2 parents 77bf27c + 11bae8a
commit f42a10a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/demo-dna-seq-processing-wf/pkg.json b/demo-dna-seq-processing-wf/pkg.json
@@ -34,4 +34,4 @@
     "license": "AGPL-3.0",
     "bugReport": "https://github.com/icgc-argo/demo-wfpkgs/issues",
     "homepage": "https://github.com/icgc-argo/demo-wfpkgs#readme"
-}
+}
diff --git a/demo-utils/local_modules/cleanup-workdir.nf b/demo-utils/local_modules/cleanup-workdir.nf
@@ -26,23 +26,24 @@
 /* this block is auto-generated based on info from pkg.json where   */
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
-version = '1.2.0'
+version = '1.3.0'
 container = [
     'ghcr.io': 'ghcr.io/icgc-argo/demo-wfpkgs.demo-utils',
     'quay.io': 'quay.io/icgc-argo/demo-wfpkgs.demo-utils'
 ]
-default_container_registry = 'quay.io'
+default_container_registry = 'ghcr.io'
 /********************************************************************/
 
 params.cpus = 1
 params.mem = 1
 params.files_to_delete = 'NO_FILE'
 params.container_version = ''
-params.container_registry = default_container_registry
+params.container = ''
+params.container_registry = ''
 
 
 process cleanupWorkdir {
-    container "${container[params.container_registry]}:${params.container_version ?: version}"
+    container "${params.container ?: container[params.container_registry ?: default_container_registry]}:${params.container_version ?: version}"
     cpus params.cpus
     memory "${params.mem} GB"
 

diff --git a/demo-utils/main.nf b/demo-utils/main.nf
@@ -27,7 +27,7 @@
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
 name = 'demo-utils'
-version = '1.2.0'
+version = '1.3.0'
 /********************************************************************/
 
 

diff --git a/demo-utils/pkg.json b/demo-utils/pkg.json
@@ -1,6 +1,6 @@
 {
     "name": "demo-utils",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "Package with helper utilities",
     "main": "main.nf",
     "scripts": {

diff --git a/demo-utils/tests/test-3.nf.json b/demo-utils/tests/test-3.nf.json
@@ -1,5 +1,5 @@
 {
   "file_name": "123.fa",
   "file_size": 256,
-  "container_registry": "quay.io"
+  "container_registry": "ghcr.io"
 }