diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-12 11:05:56 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-12 11:05:56 +0200 |
| commit | ed7f037479107e52e48bdbe65aa013b1ae6cd32e (patch) | |
| tree | b560b77dd8300d4a5c33b03726d607e22e85cedc /node-admin | |
| parent | aab056aa72ef97c0a16661b994673bf4328e3b77 (diff) | |
Add deleteUnusedDockerImages to DockerOperations
Diffstat (limited to 'node-admin')
2 files changed, 9 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java index 750129749ea..6adf9a5c0b6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java @@ -10,6 +10,7 @@ import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import com.yahoo.vespa.hosted.node.admin.nodeagent.ContainerData; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; +import java.time.Duration; import java.util.List; import java.util.Optional; @@ -52,4 +53,6 @@ public interface DockerOperations { Optional<ContainerStats> getContainerStats(NodeAgentContext context); List<ContainerLite> listContainers(); + + boolean deleteUnusedDockerImages(List<DockerImage> wantedImages, Duration minImageAgeToDelete); } 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 7c34f4d983f..1a0e59a58e1 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 @@ -23,6 +23,7 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -334,6 +335,11 @@ public class DockerOperationsImpl implements DockerOperations { return docker.listAllContainers(); } + @Override + public boolean deleteUnusedDockerImages(List<DockerImage> wantedImages, Duration minImageAgeToDelete) { + return docker.deleteUnusedDockerImages(wantedImages, minImageAgeToDelete); + } + /** Returns whether given nodeType is a Docker host for infrastructure nodes */ private static boolean isInfrastructureHost(NodeType nodeType) { return nodeType == NodeType.config || |