diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2018-09-18 21:51:47 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2018-09-18 21:51:47 +0200 |
commit | 6eb4ec9153b14c2fbbcb8264c96854f9848b10e6 (patch) | |
tree | 8a0b658ccf33afa0719ea24b73432ee28ad37ab6 /docker-api/src | |
parent | eec91304488da49d96d05bd529455883c88ea157 (diff) |
Remove deleteImage() from Docker interface
Diffstat (limited to 'docker-api/src')
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java | 3 | ||||
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 13 |
2 files changed, 6 insertions, 10 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 5c2da5c8fad..3752497e13b 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 @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.dockerapi; import java.net.InetAddress; import java.util.List; -import java.util.Map; import java.util.Optional; /** @@ -88,8 +87,6 @@ public interface Docker { */ boolean pullImageAsyncIfNeeded(DockerImage image); - void deleteImage(DockerImage dockerImage); - /** * Deletes the local images that are currently not in use by any container and not recently used. */ 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 26ab9cb819c..b1d069d1192 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 @@ -83,7 +83,7 @@ public class DockerImpl implements Docker { } // For testing - DockerImpl(final DockerClient dockerClient) { + DockerImpl(DockerClient dockerClient) { this(null, null); this.dockerClient = dockerClient; } @@ -140,7 +140,7 @@ public class DockerImpl implements Docker { } @Override - public boolean pullImageAsyncIfNeeded(final DockerImage image) { + public boolean pullImageAsyncIfNeeded(DockerImage image) { try { synchronized (monitor) { if (scheduledPulls.contains(image)) return true; @@ -159,7 +159,7 @@ public class DockerImpl implements Docker { } } - private void removeScheduledPoll(final DockerImage image) { + private void removeScheduledPoll(DockerImage image) { synchronized (monitor) { scheduledPulls.remove(image); } @@ -168,7 +168,7 @@ public class DockerImpl implements Docker { /** * Check if a given image is already in the local registry */ - boolean imageIsDownloaded(final DockerImage dockerImage) { + boolean imageIsDownloaded(DockerImage dockerImage) { return inspectImage(dockerImage).isPresent(); } @@ -296,7 +296,7 @@ public class DockerImpl implements Docker { } @Override - public void stopContainer(final ContainerName containerName) { + public void stopContainer(ContainerName containerName) { try { dockerClient.stopContainerCmd(containerName.asString()).withTimeout(secondsToWaitBeforeKilling).exec(); } catch (NotModifiedException ignored) { @@ -381,8 +381,7 @@ public class DockerImpl implements Docker { } } - @Override - public void deleteImage(final DockerImage dockerImage) { + private void deleteImage(final DockerImage dockerImage) { try { dockerClient.removeImageCmd(dockerImage.asString()).exec(); } catch (NotFoundException ignored) { |