diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-01-27 15:58:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 15:58:22 +0100 |
| commit | 1979ae27956fc628eac97bbe7a285921a0085ef3 (patch) | |
| tree | a09a4ae73098078ad0c453b0fd5dc2da428ea48a | |
| parent | 0fd074cfc1d188981e06c6afa8db3999609f22ce (diff) | |
| parent | 3f19ba00f1a60af09547caaa78792785a63bfba3 (diff) | |
Merge pull request #16252 from vespa-engine/mpolden/add-context
Add context to deleteUnusedContainerImages
2 files changed, 2 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java index 255c04e0072..dddd023aa85 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperations.java @@ -71,6 +71,6 @@ public interface ContainerOperations { boolean retainManagedContainers(TaskContext context, Set<ContainerName> containerNames); /** Deletes the local images that are currently not in use by any container and not recently used. */ - boolean deleteUnusedContainerImages(List<DockerImage> excludes, Duration minImageAgeToDelete); + boolean deleteUnusedContainerImages(TaskContext context, List<DockerImage> excludes, Duration minImageAgeToDelete); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java index abbee452313..00fed2ba6b7 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/ContainerOperationsImpl.java @@ -338,7 +338,7 @@ public class ContainerOperationsImpl implements ContainerOperations { } @Override - public boolean deleteUnusedContainerImages(List<DockerImage> excludes, Duration minImageAgeToDelete) { + public boolean deleteUnusedContainerImages(TaskContext context, List<DockerImage> excludes, Duration minImageAgeToDelete) { return containerEngine.deleteUnusedDockerImages(excludes, minImageAgeToDelete); } |