first function transitioned to clj-docker 0.4.0

TimoKramer · Feb 23, 2020 · d944ebc · d944ebc
1 parent 4069224
commit d944ebc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/build.boot b/build.boot
@@ -36,7 +36,7 @@
                             [com.layerware/hugsql "0.5.1"]
                             [metosin/compojure-api "2.0.0-alpha30"]
                             [prismatic/schema "1.1.12"]
-                            [lispyclouds/clj-docker-client "0.3.2"]
+                            [lispyclouds/clj-docker-client "0.4.0"]
                             [mount "0.1.16"]
                             [environ "1.1.0"]
                             [com.impossibl.pgjdbc-ng/pgjdbc-ng "0.8.3"]

diff --git a/src/bob/execution/internals.clj b/src/bob/execution/internals.clj
@@ -24,8 +24,10 @@
   "Checks if an image is present locally.
   Returns the name or the error if any."
   [name]
-  (let [result (f/try* (filter #(= (:RepoTags %) [name])
-                               (docker/image-ls states/docker-conn)))]
+  (let [images (docker/client {:category :images
+                               :conn states/docker-conn})
+        result (f/try* (filter #(= (:RepoTags %) [name])
+                               (docker/invoke images {:op :ImageList})))]
     (if (or (f/failed? result) (zero? (count result)))
       (f/fail "Failed to find %s" name)
       name)))
@@ -112,6 +114,14 @@
       err)))
 
 (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"]}])
+
+
+
   (build "busybox:musl"
          {:needs_resource "source"
           :cmd            "ls"}

diff --git a/src/bob/states.clj b/src/bob/states.clj
@@ -51,9 +51,7 @@
   :start (repl/migrate migration-config))
 
 (m/defstate docker-conn
-  :start (docker/connect)
-  :stop  (do (log/info "Closing docker connection")
-             (docker/disconnect docker-conn)))
+  :start (docker/connect {:uri "unix:///var/run/docker.sock"}))
 
 (comment
   (m/start)

diff --git a/test/bob/execution/internals_test.clj b/test/bob/execution/internals_test.clj
@@ -22,11 +22,13 @@
 
 (deftest docker-image-presence
   (testing "image present"
-    (with-redefs-fn {#'docker/image-ls (constantly [{:RepoTags ["img"]}])}
+    (with-redefs-fn {#'docker/client (constantly nil)
+                     #'docker/invoke (constantly [{:RepoTags ["img"]}])}
       #(is (= "img" (has-image "img")))))
 
   (testing "image absent"
-    (with-redefs-fn {#'docker/image-ls (constantly [])}
+    (with-redefs-fn {#'docker/client (constantly nil)
+                     #'docker/invoke (constantly [{:RepoTags ["foo"]}])}
       #(let [result (has-image "img")]
          (is (and (f/failed? result)
                   (= "Failed to find img"