script resources collection

Author: slimslenderslacks

docs/content/tools/docs/mcp-server.md

@@ -0,0 +1,15 @@
+---
+title: running the mcp/docker image
+---
+
+## Logging
+
+When the Docker MCP server is [enabled for claude desktop](claude-desktop), the `mcp/docker` image will be running
+locally. You can tail the server logs by running the following command:
+
+```sh
+docker run --rm -t --init \
+           -v docker-prompts:/prompts alpine:latest \
+           tail -f /prompts/log/docker-mcp-server.out
+```
+

prompts/bootstrap.md

@@ -1,4 +1,5 @@
 ---
+name: register a new skill
 tools:
   - name: register-skill
     description: Register a new skill

prompts/examples/qrencode.md

@@ -13,8 +13,7 @@ parameter-values:
 
 # prompt
 
-Generate a QR code for the content '{{content}}'.
-Save the generated image to `/thread/resources/qrcode.png`.
+Generate a QR code for the content '{{content}}' and write the output to the file `/thread/resources/qrcode.png`.
 If the command fails, read the man page and try again.
 If successful, output the path to the generated image in markdown syntax.
 

src/docker.clj

@@ -4,7 +4,6 @@
    [babashka.fs :as fs]
    [cheshire.core :as json]
    [clojure.core.async :as async]
-   [clojure.java.io :as io]
    [clojure.pprint :refer [pprint]]
    [clojure.string :as string]
    [creds]
@@ -109,7 +108,7 @@
 ;; Tty wraps the process in a pseudo terminal
 {:StdinOnce true
  :OpenStdin true}
-(defn create-container [{:keys [image entrypoint workdir command host-dir env thread-id opts mounts volumes] :or {opts {:Tty true}} :as m}]
+(defn create-container [{:keys [image entrypoint workdir command host-dir env thread-id opts mounts volumes] :or {opts {:Tty true}}}]
   #_(jsonrpc/notify :message {:content (str m)})
   (let [payload (json/generate-string
                  (merge
@@ -167,6 +166,8 @@
    {:raw-args ["--unix-socket" "/var/run/docker.sock"]
     :throw false}))
 
+;; container was created with a Terminal (output is not-multiplexed)
+;; use after the container has stopped (not streaming)
 (defn attach-container [{:keys [Id]}]
   ;; logs is true (as opposed to stream=true) so we run this after the container has stopped
   ;; TTY is true above so this is the just the raw data sent to the PTY (not multiplexed)
@@ -175,6 +176,7 @@
    {:raw-args ["--unix-socket" "/var/run/docker.sock"]
     :throw false}))
 
+;; container was created without a Terminal (output is multiplexed so read as bytes)
 (defn attach-container-stdout-logs [{:keys [Id]}]
   ;; this assumes no Tty so the output will be multiplexed back
   (curl/post
@@ -183,8 +185,8 @@
     :as :bytes
     :throw false}))
 
+;; container must be created with a Terminal (so we can stream with a Reader)
 (defn attach-container-stream-stdout [{:keys [Id]}]
-  ;; this assumes no Tty so the output will be multiplexed back
   (curl/post
    (format "http://localhost/containers/%s/attach?stderr=false&stdout=true&stream=true" Id)
    {:raw-args ["--unix-socket" "/var/run/docker.sock"]
@@ -256,46 +258,55 @@
   [m cb]
   (when (not (has-image? (:image m)))
     (-pull m))
-  (let [x (create m)
+  (let [x (-> m
+              (update :opts
+                      (fnil merge {})
+                      {:Tty true
+                       :StdinOnce false
+                       :OpenStdin false
+                       :AttachStdin false})
+              (create))
         finished-channel (async/promise-chan)]
     (start x)
 
     (async/go
       (try
         (let [s (:body (attach-container-stream-stdout x))]
-          (println s)
           (doseq [line (line-seq (java.io.BufferedReader. (java.io.InputStreamReader. s)))]
             (cb line)))
         (catch Throwable e
           (println e))))
 
-;; watch the container
+    ;; watch the container
     (async/go
       (wait x)
       (async/>! finished-channel {:done :exited}))
 
-;; body is raw PTY output
-    (let [finish-reason (async/<!! finished-channel)
-          s (:body (attach x))
-          info (inspect x)]
-      (delete x)
-      (merge
-       finish-reason
-       {:pty-output s
-        :exit-code (-> info :State :ExitCode)
-        :info info}))))
+    {:container x
+     ;; stopped channel
+     :stopped (async/go
+                ;; body is raw PTY output
+                (let [finish-reason (async/<!! finished-channel)
+                      s (:body (attach x))
+                      info (inspect x)]
+                  (delete x)
+                  (merge
+                   finish-reason
+                   {:pty-output s
+                    :exit-code (-> info :State :ExitCode)
+                    :info info})))}))
 
 (comment
   (async/thread
     (run-streaming-function-with-no-stdin
-      {:image "vonwig/inotifywait:latest"
-       :volumes ["docker-prompts:/prompts"]
-       :command ["-e" "create" "-e" "modify" "-e" "delete" "-q" "-m" "/prompts"]
-       :opts {:Tty true
-              :StdinOnce false
-              :OpenStdin false
-              :AttachStdin false}}
-      println)))
+     {:image "vonwig/inotifywait:latest"
+      :volumes ["docker-prompts:/prompts"]
+      :command ["-e" "create" "-e" "modify" "-e" "delete" "-q" "-m" "/prompts"]
+      :opts {:Tty true
+             :StdinOnce false
+             :OpenStdin false
+             :AttachStdin false}}
+     println)))
 
 (defn run-function
   "run container function with no stdin, and no streaming output"
@@ -327,6 +338,9 @@
         :exit-code (-> info :State :ExitCode)
         :info info}))))
 
+;; not curl - opens a real socket to write to the container stdin
+;;  returns the open socket - closing the socket will signal the program to finish
+;;          if it's waiting on input
 (defn write-stdin [container-id content]
   (let [buf (ByteBuffer/allocate (* 1024 20))
         address (UnixDomainSocketAddress/of "/var/run/docker.sock")
@@ -362,7 +376,10 @@
       (println t)
       "")))
 
-(defn function-call-with-stdin [m]
+(defn function-call-with-stdin 
+  "creates and starts container, then writes to stdin process
+     returns container map with Id, and socket - socket is open socket to stdin"
+  [m]
   (when (not (has-image? (:image m)))
     (-pull m))
   (let [x (merge
@@ -390,7 +407,8 @@
     (async/go
       (wait x)
       (async/>! finished-channel {:done :exited}))
-    ;; body is raw PTY output
+    ;; body is raw PTY output - could we 
+    ;;   have just been reading from the socket since it's two way?
     (try
       (let [finish-reason (async/<!! finished-channel)
             s (docker-stream-format->stdout

src/git.clj

@@ -56,6 +56,13 @@
        (fs/create-dirs default-dir)
        default-dir))))
 
+(comment
+  "alpine/git uses a VOLUME /git declaration
+   so we need to mount something there or docker will create
+   a volume.
+   https://docs.docker.com/reference/dockerfile/#volume
+   see https://hub.docker.com/r/alpine/git for usage guidelines")
+
 (defn pull [{:keys [dir ref]}]
   (docker/run-container
    (merge
@@ -64,24 +71,31 @@
                       (when ref [ref]))}
     (if (string/starts-with? (str dir) "/prompts")
       {:workdir (str dir)
+       :volumes ["docker-prompts-git:/git"]
        :mounts ["docker-prompts:/prompts:rw"]}
-      {:host-dir (str dir)}))))
+      {:host-dir (str dir)
+       :volumes ["docker-prompts-git:/git"]}))))
 
 (defn clone [{:keys [dir owner repo ref ref-hash]}]
   (docker/run-container
    (merge
     {:image "alpine/git:latest"}
     (if (string/starts-with? (str dir) "/prompts")
       {:workdir (str dir)
+       :volumes ["docker-prompts-git:/git"]
        :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
                         (when ref ["-b" ref])
                         [(format "/prompts/%s" ref-hash)])
        :mounts ["docker-prompts:/prompts:rw"]}
       {:host-dir (str dir)
+       :volumes ["docker-prompts-git:/git"]
        :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
                         (when ref ["-b" ref])
                         [(format "/project/%s" ref-hash)])}))))
 
+(comment
+  (clone {:dir "/Users/slim/crap" :owner "docker" :repo "labs-make-runbook" :ref "main" :ref-hash "crap"}))
+
 (defn prompt-file
   "returns the path or nil if the github ref does not resolve
    throws if the path in the repo does not exist or if the clone fails"

src/jsonrpc/db.clj

@@ -44,7 +44,6 @@
   (try
     (let [{:keys [registry]} (yaml/parse-string registry-content)
           prompt-registry (get-prompt-data (assoc opts :register (map :ref (vals registry))))]
-      (logger/info "merging" prompt-registry)
       (swap! db* add-dynamic-prompts prompt-registry))
     (catch Throwable e
       (logger/error e "could not merge dynamic prompts"))))

src/jsonrpc/logger.clj

@@ -50,3 +50,6 @@
     `(when *logger*
        (-debug *logger* ~fmeta ~@args))))
 
+(defn trace [x]
+  (info "trace " x)
+  x)