From 24edb85cd22ec149a96b28f58de2ba2b35fdd8dc Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@oath.com>
Date: Thu, 28 Sep 2017 16:23:27 +0200
Subject: Upgrade docker-java

---
 docker-api/pom.xml                                                      | 2 +-
 .../src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-api/pom.xml b/docker-api/pom.xml
index b3f6d1ec12f..fc374a12dd2 100644
--- a/docker-api/pom.xml
+++ b/docker-api/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java</artifactId>
-            <version>3.0.8</version>
+            <version>3.0.13</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
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 db10a85bb45..a6f8783a22c 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
@@ -419,7 +419,7 @@ public class DockerImpl implements Docker {
     @Override
     public void buildImage(File dockerfile, DockerImage image) {
         try {
-            dockerClient.buildImageCmd(dockerfile).withTag(image.asString())
+            dockerClient.buildImageCmd(dockerfile).withTags(Collections.singleton(image.asString()))
                     .exec(new BuildImageResultCallback()).awaitImageId();
         } catch (RuntimeException e) {
             numberOfDockerDaemonFails.add();
-- 
cgit v1.2.3