fix issue with potential nullable repo tags

whisklabs · Oct 11, 2016 · 44ff5ac · 44ff5ac
1 parent 2acc2a3
commit 44ff5ac
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala b/impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala
@@ -156,7 +156,13 @@ class DockerJavaExecutor(override val host: String, client: DockerClient)
   }
 
   override def listImages()(implicit ec: ExecutionContext): Future[Set[String]] = {
-    Future(client.listImagesCmd().exec().asScala.flatMap(_.getRepoTags).toSet)
+    Future(
+        client
+          .listImagesCmd()
+          .exec()
+          .asScala
+          .flatMap(img => Option(img.getRepoTags).getOrElse(Array()))
+          .toSet)
   }
 
   override def pullImage(image: String)(implicit ec: ExecutionContext): Future[Unit] = {