From b541eaa0744f91e4292ff04eca34f11b3b03a520 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Tue, 23 Feb 2016 06:41:58 -0800 Subject: [PATCH] Fix: Docker remove context item should delete container not image --- plugins/dynamix.docker.manager/include/DockerClient.php | 1 - plugins/dynamix.docker.manager/javascript/docker.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index f9983fb6d..9f9f8fddc 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -493,7 +493,6 @@ class DockerUpdate{ public function setUpdateStatus($image, $version) { global $dockerManPaths; - $DockerClient = new DockerClient(); $update_file = $dockerManPaths['update-status']; $updateStatus = (is_file($update_file)) ? json_decode(file_get_contents($update_file), true) : []; $updateStatus[$image] = [ diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index 83b376f33..35778d446 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -119,7 +119,7 @@ function rmContainer(container, image, id) { if ($("#removeimagechk").prop('checked')) { eventControl({action: "remove_all", container: id, image: image}); } else { - eventControl({action: "remove_image", image: image}); + eventControl({action: "remove_container", container: id}); } }); }