Slim/0.0.16 (#250)

* Use raw docker.sock for hidden containers
* Update to 0.0.16

Author: slimslenderslacks

runbook.md

@@ -20,7 +20,7 @@ docker pull mcp/docker:prerelease
 
 ```sh
 # docker:command=build-release
-VERSION="0.0.15"
+VERSION="0.0.16"
 docker buildx build \
     --builder hydrobuild \
     --platform linux/amd64,linux/arm64 \

src/docker.clj

@@ -106,6 +106,12 @@
    {:raw-args ["--unix-socket" (get-backend-socket)]
     :throw false}))
 
+(defn backend-get-version [_]
+  (curl/get
+   "http://localhost/versions"
+   {:raw-args ["--unix-socket" (get-backend-socket)]
+    :throw false}))
+
 (comment
   (let [pat (string/trim (slurp "/Users/slim/.secrets/dockerhub-pat-ai-tools-for-devs.txt"))]
     (pull-image {:image "vonwig/go-linguist:latest"
@@ -116,8 +122,13 @@
 (defn list-containers [m]
   (curl/get
    "http://localhost/containers/json"
-   {:raw-args ["--unix-socket" "/var/run/docker.sock"]
-    :throw false}))
+   {:raw-args ["--unix-socket" (let [f (fs/file "/var/run/docker.raw.sock")
+                                     macos (fs/file (format "%s/Library/Containers/com.docker.docker/Data/docker.raw.sock" (System/getenv "HOME")))]
+                                 (cond (.exists f) "/var/run/docker.raw.sock"
+                                       (.exists macos) (format "%s/Library/Containers/com.docker.docker/Data/docker.raw.sock" (System/getenv "HOME"))
+                                       :else "/var/run/docker.sock"))]
+    :throw false
+    :query-params {:filters (json/generate-string m)}}))
 
 (defn list-images [m]
   (curl/get
@@ -172,6 +183,7 @@
 ;; Tty wraps the process in a pseudo terminal
 ;; StdinOnce closes the stdin after the first client detaches
 ;; OpenStdin just opens stdin
+(declare secrets-get)
 (defn create-container [{:keys [image entrypoint workdir command host-dir
                                 environment thread-id opts mounts volumes
                                 ports network_mode secrets labels]
@@ -188,9 +200,10 @@
                   {:Labels  (->> (concat
                                   (->> secrets
                                        keys
-                                       (map (fn [secret-key]
-                                              (let [s (name secret-key)]
-                                                [(format "x-secret:%s" s) (string/trim (format "/secret/%s" s))]))))
+                                       (mapcat (fn [secret-key]
+                                                 (let [s (name secret-key)]
+                                                   (when (secrets-get (name secret-key))
+                                                     [[(format "x-secret:%s" s) (string/trim (format "/secret/%s" s))]])))))
                                   (seq labels))
                                  (into {}))}
                   {:HostConfig
@@ -296,6 +309,12 @@
    {:raw-args ["--unix-socket" "/var/run/docker.sock"]
     :throw false}))
 
+(defn stop-container [{:keys [Id]}]
+  (curl/post
+   (format "http://localhost/containers/%s/stop" Id)
+   {:raw-args ["--unix-socket" "/var/run/docker.sock"]
+    :throw false}))
+
 (defn ->json [response]
   (json/parse-string (:body response) keyword))
 
@@ -308,6 +327,7 @@
 (def is-logged-in? (comp ->json (status? 200 "backend-is-logged-in") backend-is-logged-in?))
 (def get-token (comp ->json (status? 200 "backend-get-token") backend-get-token))
 (def get-login-info (comp ->json (status? 200 "backend-login-info") backend-login-info))
+(def get-versions (comp ->json (status? 200 "backend-get-versions") backend-get-version))
 (def create (comp ->json (status? 201 "create-container") create-container))
 (def thread-volume (comp (status? 201 "create-volume") create-volume))
 (def delete-thread-volume (comp (status? 204 "remove-volume") remove-volume))

src/extension/docker-compose.yaml

@@ -1,10 +1,11 @@
 services:
   mcp_docker:
-    image: mcp/docker:0.0.15
+    image: mcp/docker:0.0.16
     ports:
       - 8811:8811
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/var/run/docker.raw.sock:/var/run/docker.raw.sock"
       - "/run/host-services/backend.sock:/backend.sock"
       - "/run/guest-services/jfs.sock:/jfs.sock"
       - "docker-prompts:/prompts"

src/git.clj

@@ -59,7 +59,8 @@
    (merge
     {:image "alpine/git:latest"
      :command (concat ["reset" "--hard"]
-                      (if ref [(format "origin/%s" ref)] ["origin/main"]))}
+                      (if ref [(format "origin/%s" ref)] ["origin/main"]))
+     :timeout 60000}
     (if (string/starts-with? (str dir) "/prompts")
       {:workdir (str dir)
        :volumes ["docker-prompts-git:/git"
@@ -72,7 +73,8 @@
    (merge
     {:image "alpine/git:latest"
      :command (concat ["pull" "origin"]
-                      (when ref [ref]))}
+                      (when ref [ref]))
+     :timeout 60000}
     (if (string/starts-with? (str dir) "/prompts")
       {:workdir (str dir)
        :volumes ["docker-prompts-git:/git"
@@ -83,7 +85,8 @@
 (defn clone [{:keys [dir owner repo ref ref-hash]}]
   (docker/run-container
    (merge
-    {:image "alpine/git:latest"}
+    {:image "alpine/git:latest"
+     :timeout 60000}
     (if (string/starts-with? (str dir) "/prompts")
       {:workdir (str dir)
        :volumes ["docker-prompts-git:/git"

src/jsonrpc/prompt_change_events.clj

@@ -51,6 +51,15 @@
 (defn init-dynamic-prompt-watcher [opts registry-updated markdown-tool-updated]
   (let [change-events-channel (async/chan)
         debounced (debounce-by change-events-channel content)]
+    (doseq [container (docker/containers {:label ["com.docker.desktop.extension=true"
+                                                  "com.docker.mcp.watch-service=true"]
+                                          :name ["com.docker.mcp.watch-service"]})]
+      (logger/info "shutting down previous vonwig/inotifywait container" (:name container))
+      (try
+        (docker/stop-container container)
+        (docker/kill-container container)
+        (catch Throwable _
+          (logger/warn "unable to kill conainer " (:Id container)))))
     ;; debounce the change event channel
     (async/go-loop
      [evt (async/<! debounced)]
@@ -60,28 +69,34 @@
         :unknown)
       (recur (async/<! debounced)))
     ;; watch filesystem
-    (let [{x :container}
-          (docker/run-streaming-function-with-no-stdin
-           {:image "vonwig/inotifywait:latest"
-            :labels {"com.docker.desktop.service" "true"}
-            :volumes ["docker-prompts:/prompts"]
-            :command ["-e" "create" "-e" "modify" "-e" "delete" "-q" "-m" "/prompts"]}
-           (fn [line]
-             (let [[_dir _event f] (string/split line #"\s+")]
-               (async/put!
-                change-events-channel
-                (cond
-                  (= f "registry.yaml")
-                  {:opts opts :f f :type :registry}
-                  (string/ends-with? f ".md")
-                  {:opts opts :f f :type :markdown}
-                  :else
-                  {})))))]
-      (shutdown/schedule-container-shutdown
-       (fn []
-         (logger/info "inotifywait shutting down")
-         (docker/kill-container x)
-         (docker/delete x))))))
+    (try
+      (let [{x :container}
+            (docker/run-streaming-function-with-no-stdin
+              {:image "vonwig/inotifywait:latest"
+               :labels {"com.docker.desktop.extension" "true"
+                        "com.docker.mcp.watch-service" "true"
+                        "com.docker.compose.project" "docker_labs-ai-tools-for-devs-desktop-extension"
+                        "com.docker.compose.service" "registry-watcher"}
+               :volumes ["docker-prompts:/prompts"]
+               :command ["-e" "create" "-e" "modify" "-e" "delete" "-q" "-m" "/prompts"]}
+              (fn [line]
+                (let [[_dir _event f] (string/split line #"\s+")]
+                  (async/put!
+                    change-events-channel
+                    (cond
+                      (= f "registry.yaml")
+                      {:opts opts :f f :type :registry}
+                      (string/ends-with? f ".md")
+                      {:opts opts :f f :type :markdown}
+                      :else
+                      {})))))]
+        (shutdown/schedule-container-shutdown
+          (fn []
+            (logger/info "inotifywait shutting down")
+            (docker/kill-container x)
+            (docker/delete x))))
+      (catch Throwable t
+        (logger/error "unable to start registry.yaml watcher" t)))))
 
 (comment
   (repl/setup-stdout-logger)

src/jsonrpc/server.clj

@@ -404,7 +404,7 @@
          :out-chan-factory io-chan/mcp-output-stream->output-chan})))))
 
 (defn run-socket-server! [opts server-opts]
-  (logger/info "Starting socket server on" (:port opts))
+  (logger/info (format "Starting socket server (docker version %s) on port %s" (:appVersion (docker/get-versions {})) (:port opts)))
   (socket-server/server (merge opts server-opts)))
 
 (defn run-server! [opts server-opts]
@@ -414,7 +414,7 @@
                   server-opts
                   {:in (or (:in opts) System/in)
                    :out System/out}))]
-     (logger/info "Starting server...")
+     (logger/info (format "Starting server (docker version %s)..." (:appVersion (docker/get-versions {}))))
      ;; only on lsp.server/start will the stdio channels start being used
      (let [server-id (swap! jsonrpc.state/server-counter inc)
            {:keys [producer] :as context}