Add valid hostname to DockerHubFlow (#3178) (#3182)

support "docker.io" as a valid host name for dockerhub. add tests.

Author: ruchim

centaur/src/main/resources/standardTestCases/cacheBetweenWF/cacheBetweenWF.wdl

@@ -8,7 +8,7 @@ task getAverage {
         Float average = read_float(stdout())
     }
     runtime {
-       docker: "ubuntu@sha256:71cd81252a3563a03ad8daee81047b62ab5d892ebbfbf71cf53415f29c130950"
+       docker: "docker.io/ubuntu@sha256:71cd81252a3563a03ad8daee81047b62ab5d892ebbfbf71cf53415f29c130950"
     }
 }
 

centaur/src/main/resources/standardTestCases/docker_hash/docker_hash_dockerhub.wdl

@@ -1,12 +1,19 @@
 task dockerhub {
+    String hostname
     command {
         echo "hello"
     }
     runtime {
-        docker: "ubuntu:precise-20161209"
+        docker: hostname + "ubuntu:precise-20161209"
     }
 }
 
 workflow docker_hash_dockerhub {
-    call dockerhub
+
+    call dockerhub as dockerWithoutHost { input: hostname = "" }
+
+    call dockerhub as implicitRegistryHost { input: hostname = "docker.io/" }
+
+    call dockerhub as defaultRegistryHost { input: hostname = "index.docker.io/" }
 }
+

centaur/src/main/resources/standardTestCases/docker_hash_dockerhub.test

@@ -6,6 +6,10 @@ files {
 }
 
 metadata {
-  "calls.docker_hash_dockerhub.dockerhub.runtimeAttributes.docker": "ubuntu:precise-20161209",
-  "calls.docker_hash_dockerhub.dockerhub.dockerImageUsed": "ubuntu@sha256:abdc090336ba4503bd72d0961a4f3d45134900d9a793d3f0c06a64d2555fbab7"
+  "calls.docker_hash_dockerhub.dockerWithoutHost.runtimeAttributes.docker": "ubuntu:precise-20161209",
+  "calls.docker_hash_dockerhub.dockerWithoutHost.dockerImageUsed": "ubuntu@sha256:abdc090336ba4503bd72d0961a4f3d45134900d9a793d3f0c06a64d2555fbab7",
+  "calls.docker_hash_dockerhub.implicitRegistryHost.runtimeAttributes.docker": "docker.io/ubuntu:precise-20161209",
+  "calls.docker_hash_dockerhub.implicitRegistryHost.dockerImageUsed": "docker.io/ubuntu@sha256:abdc090336ba4503bd72d0961a4f3d45134900d9a793d3f0c06a64d2555fbab7",
+  "calls.docker_hash_dockerhub.defaultRegistryHost.runtimeAttributes.docker": "index.docker.io/ubuntu:precise-20161209",
+  "calls.docker_hash_dockerhub.defaultRegistryHost.dockerImageUsed": "index.docker.io/ubuntu@sha256:abdc090336ba4503bd72d0961a4f3d45134900d9a793d3f0c06a64d2555fbab7"
 }

dockerHashing/src/main/scala/cromwell/docker/registryv2/flows/dockerhub/DockerHubFlow.scala

@@ -16,7 +16,9 @@ object DockerHubFlow {
   private val DockerHubDefaultRegistry = "index.docker.io"
   private val RegistryHostName = "registry-1.docker.io"
   private val AuthorizationServerHostName = "auth.docker.io"
+  private val DockerHubImplicitRegistryHostName = "docker.io"
   private val ServiceName = Option("registry.docker.io")
+  private val validDockerHubHosts = Array(DockerHubDefaultRegistry, RegistryHostName, DockerHubImplicitRegistryHostName)
 }
 
 class DockerHubFlow(httpClientFlow: HttpDockerFlow)(implicit ec: ExecutionContext, materializer: ActorMaterializer, scheduler: Scheduler) 
@@ -40,7 +42,7 @@ class DockerHubFlow(httpClientFlow: HttpDockerFlow)(implicit ec: ExecutionContex
     dockerImageIdentifierWithoutHash.host match {
         // If no host is provided, assume dockerhub
       case None => true
-      case Some(host) if host == registryHostName || host == DockerHubDefaultRegistry => true
+      case Some(host) if validDockerHubHosts.contains(host) => true
       case _ => false
     }
   }