Remove useless method

4 files changed, 2 insertions, 26 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 64f804e0d02..5c2da5c8fad 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
@@ -67,8 +67,6 @@ public interface Docker {
 
     Optional<ContainerStats> getContainerStats(ContainerName containerName);
 
-    void createContainer(CreateContainerCommand createContainerCommand);
-
     void startContainer(ContainerName containerName);
 
     void stopContainer(ContainerName containerName);
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 d118ce30b68..26ab9cb819c 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
@@ -284,18 +284,6 @@ public class DockerImpl implements Docker {
     }
 
     @Override
-    public void createContainer(CreateContainerCommand createContainerCommand) {
-        try {
-            dockerClient.execCreateCmd(createContainerCommand.toString());
-        } catch (NotModifiedException ignored) {
-            // If is already created, ignore
-        } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
-            throw new DockerException("Failed to create container '" + createContainerCommand.toString() + "'", e);
-        }
-    }
-
-    @Override
     public void startContainer(ContainerName containerName) {
         try {
             dockerClient.startContainerCmd(containerName.asString()).exec();
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index ccecb4e1d67..fdf825e7a24 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -88,13 +88,12 @@ public class DockerOperationsImpl implements DockerOperations {
                 .withAddCapability("SYS_PTRACE") // Needed for gcore, pstack etc.
                 .withAddCapability("SYS_ADMIN"); // Needed for perf
 
-        if (environment.getNodeType() == NodeType.confighost ||
-                environment.getNodeType() == NodeType.proxyhost) {
+        if (environment.getNodeType() == NodeType.confighost || environment.getNodeType() == NodeType.proxyhost) {
             command.withVolume("/var/lib/sia", "/var/lib/sia");
         }
 
         if (environment.getNodeType() == NodeType.proxyhost) {
-            command.withVolume("/opt/yahoo/share/ssl/certs/", "/opt/yahoo/share/ssl/certs/");
+            command.withVolume("/opt/yahoo/share/ssl/certs", "/opt/yahoo/share/ssl/certs");
         }
 
         if (environment.getNodeType() == NodeType.host) {
@@ -143,8 +142,6 @@ public class DockerOperationsImpl implements DockerOperations {
 
         logger.info("Creating new container with args: " + command);
         command.create();
-
-        docker.createContainer(command);
     }
 
     void addEtcHosts(ContainerData containerData,
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
index 38d83a219f1..64df715aa97 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
@@ -70,13 +70,6 @@ public class DockerMock implements Docker {
     }
 
     @Override
-    public void createContainer(CreateContainerCommand createContainerCommand) {
-        synchronized (monitor) {
-            callOrderVerifier.add("createContainer with " + createContainerCommand.toString());
-        }
-    }
-
-    @Override
     public void startContainer(ContainerName containerName) {
         synchronized (monitor) {
             callOrderVerifier.add("startContainer with " + containerName);