kill-container

src/bob/execution/internals.clj

@@ -36,10 +36,13 @@
   "Kills a running container using SIGKILL.
   Returns the name or the error if any."
   [name]
-  (if (f/failed? (f/try* (docker/kill states/docker-conn name)))
-    (do (log/errorf "Error killing container %s" name)
-        (f/fail "Could not kill %s" name))
-    name))
+  (let [containers (docker/client {:category :containers
+                                   :conn states/docker-conn})
+        result     (docker/invoke containers {:op :ContainerKill :params {:id name}})]
+    (if (clojure.string/blank? result)
+      name
+      (do (log/errorf "Error killing container %s" name)
+          (f/fail "Could not kill %s" name)))))
 
 (defn pull
   "Pulls in an image if it's not present locally.
@@ -116,7 +119,6 @@
 (comment
   (def images (docker/client {:category :images
                               :conn states/docker-conn}))
-  (clojure.pprint/pprint images)
   (filter #(= (:RepoTags %) ["nginx:latest"]) (docker/invoke images {:op :ImageList}))
   (filter #(= (:RepoTags %) ["img"]) [{:RepoTags ["img"]}])
 

test/bob/execution/internals_test.clj

@@ -36,13 +36,13 @@
 
 (deftest container-kill
   (testing "successful kill"
-    (with-redefs-fn {#'docker/kill (fn [_ name]
-                                     (tu/check-and-fail
-                                      #(= "c1" name)))}
+    (with-redefs-fn {#'docker/client (constantly nil)
+                     #'docker/invoke (constantly "")}
       #(is (= "c1" (kill-container "c1")))))
 
   (testing "unsuccessful kill"
-    (with-redefs-fn {#'docker/kill (constantly (f/fail "Failed"))}
+    (with-redefs-fn {#'docker/client (constantly nil)
+                     #'docker/invoke (constantly "{:message \"Cannot kill container\"}")}
       #(let [result (kill-container "c1")]
          (is (and (f/failed? result)
                   (= "Could not kill c1"