Merge branch 'master' into freva/docker-always-returns-pid

# Conflicts:
#	node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
#	node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java

2 files changed, 10 insertions, 0 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
index ba22ddf9272..663bb58cacc 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
@@ -57,6 +57,8 @@ public interface Docker {
 
     Optional<Container> getContainer(String hostname);
 
+    Optional<Container> getContainer(ContainerName containerName);
+
     CompletableFuture<DockerImage> pullImageAsync(DockerImage image);
 
     boolean imageIsDownloaded(DockerImage image);
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 00ace9a1958..fd4551d0f02 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -348,6 +348,14 @@ public class DockerImpl implements Docker {
                 .findFirst();
     }
 
+    @Override
+    public Optional<Container> getContainer(ContainerName containerName) {
+        return listAllContainers().stream()
+                .flatMap(this::asContainer)
+                .filter(c -> Objects.equals(containerName, c.name))
+                .findFirst();
+    }
+
     private Stream<Container> asContainer(com.github.dockerjava.api.model.Container dockerClientContainer) {
         return inspectContainerCmd(dockerClientContainer.getId())
                 .map(response ->