Merge pull request #108 from viash-io/develop

Viash 0.5.10.1
viash-io · Mar 16, 2022 · ca9a887 · ca9a887
2 parents 7666eb6 + d84b3bc
commit ca9a887
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Viash 0.5.10.1
+
+## BUG FIX
+
+* `NextflowPlatform`: Fix passthrough of `organization` field.
+
 # Viash 0.5.10
 
 ## MAJOR CHANGES

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "viash"
 
-version := "0.5.10"
+version := "0.5.10.1"
 
 scalaVersion := "2.12.10"
 

diff --git a/src/main/scala/com/dataintuitive/viash/platforms/NextFlowPlatform.scala b/src/main/scala/com/dataintuitive/viash/platforms/NextFlowPlatform.scala
@@ -142,6 +142,7 @@ case class NextFlowPlatform(
       "container" → imageInfo.name,
       "containerTag" -> imageInfo.tag,
       "containerRegistry" -> imageInfo.registry.getOrElse(""),
+      "containerOrganization" -> imageInfo.organization.getOrElse(""),
       "command" → executionCode
     )
 
@@ -280,11 +281,12 @@ case class NextFlowPlatform(
         |}
         |
         |def effectiveContainer(processParams) {
+        |  def _organization = params.containsKey("containerOrganization") ? params.containerOrganization : processParams.containerOrganization
         |  def _registry = params.containsKey("containerRegistry") ? params.containerRegistry : processParams.containerRegistry
         |  def _name = processParams.container
         |  def _tag = params.containsKey("containerTag") ? params.containerTag : processParams.containerTag
         |
-        |  return (_registry == "" ? "" : _registry + "/") + _name + ":" + _tag
+        |  return (_registry == "" ? "" : _registry + "/") + (_organization == "" ? "" : _organization + "/") + _name + ":" + _tag
         |}
         |
         |// Convert the nextflow.config arguments list to a List instead of a LinkedHashMap