Slim/cleanup (#135)

* try to use backend sock to pull images with logged in user
* Remove backend service that wasn't being used.

Author: slimslenderslacks

.github/workflows/prompts-docker.yml

@@ -15,22 +15,23 @@ jobs:
         with:
           submodules: false
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.JIM_USERNAME }}
+          password: ${{ secrets.JIM_PAT }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.TEMP_DOCKER_USERNAME }}
-          password: ${{ secrets.TEMP_DOCKER_PAT }}
+          driver: cloud
+          endpoint: "mcp/cloud-ai-labs"
+          install: true
 
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: vonwig/prompts:latest,mcp/run:latest,mcp/docker:latest
+          tags: mcp/docker:latest

prompts/mcp/neo4j-server.md

@@ -0,0 +1,21 @@
+
+---
+mcp:
+  - container:
+      image: mcp/neo4j-server:latest
+      workdir: /app
+      secrets:
+        neo4j.password: NEO4J_PASSWORD
+        neo4j.username: NEO4J_USERNAME
+      entrypoint:
+        - "/app/mcp-neo4j-memory"
+      command:
+        - --db-url
+        - "{{neo4j.url}}"
+        - --username
+        - "${NEO4J_USERNAME}"
+        - --password
+        - "${NEO4J_PASSWORD}"
+    source:
+      url: https://github.com/slimslenderslacks/mcp-neo4j
+---

runbook.md

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

src/docker.clj

@@ -58,8 +58,8 @@
      :throw false}
     (when (or creds identity-token)
       {:headers {"X-Registry-Auth"
-                  ;; I don't think we'll be pulling images
-                  ;; from registries that support identity tokens
+                 ;; I don't think we'll be pulling images
+                 ;; from registries that support identity tokens
                  (-> (cond
                        identity-token {:identitytoken identity-token}
                        creds creds)
@@ -71,7 +71,7 @@
     s))
 
 (defn- get-backend-socket []
-  (let [coll [(or (System/getenv "DOCKER_DESKTOP_SOCKET_PATH") "")
+  (let [coll [(or (System/getenv "DOCKER_DESKTOP_SOCKET_PATH") "/backend.sock")
               (format "%s/Library/Containers/com.docker.docker/Data/backend.sock" (System/getenv "HOME"))]]
     (some unix-socket-file coll)))
 
@@ -309,6 +309,16 @@
                  {:creds {:username (:user m)
                           :password (or (:jwt m) (:pat m))}}))))
 
+(defn -add-token [m]
+  (merge
+   m
+   (try
+     (when (is-logged-in? m)
+       {:jwt (get-token m)
+        :user (:id (get-login-info m))})
+     (catch Throwable t
+       (logger/warn "user is not logged in to Docker Destkop")))))
+
 (defn has-image? [image]
   (let [[_ digest] (re-find #".*@(.*)" image)]
     (some
@@ -321,7 +331,7 @@
 (defn check-then-pull [container-definition]
   (when (not (has-image? (:image container-definition)))
     (logger/info "pulling image " (:image container-definition))
-    (-pull container-definition)))
+    ((comp -pull -add-token) container-definition)))
 
 (defn injected-entrypoint [secrets environment s]
   (->> (concat
@@ -595,8 +605,7 @@
   "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))
+  (check-then-pull m)
   (let [x (merge
            m
            (create (assoc m

src/extension/Dockerfile

@@ -1,15 +1,15 @@
-# syntax=docker/dockerfile:1.4
-FROM golang:1.24-alpine AS builder
-ENV CGO_ENABLED=0
-WORKDIR /backend
-COPY backend/go.* .
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    go mod download
-COPY backend/. .
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    go build -trimpath -ldflags="-s -w" -o bin/service
+## syntax=docker/dockerfile:1.4
+#FROM golang:1.24-alpine AS builder
+#ENV CGO_ENABLED=0
+#WORKDIR /backend
+#COPY backend/go.* .
+#RUN --mount=type=cache,target=/go/pkg/mod \
+    #--mount=type=cache,target=/root/.cache/go-build \
+    #go mod download
+#COPY backend/. .
+#RUN --mount=type=cache,target=/go/pkg/mod \
+    #--mount=type=cache,target=/root/.cache/go-build \
+    #go build -trimpath -ldflags="-s -w" -o bin/service
 
 FROM --platform=$BUILDPLATFORM node:23-alpine3.20 AS client-builder
 WORKDIR /ui
@@ -34,14 +34,14 @@ LABEL org.opencontainers.image.title="AI Tool Catalog" \
     com.docker.extension.categories="utility-tools" \
     com.docker.extension.changelog="Added MCP catalog"
 
-COPY --from=builder /backend/bin/service /
+#COPY --from=builder /backend/bin/service /
 COPY docker-compose.yaml .
 COPY metadata.json .
 COPY docker.svg /docker.svg
 COPY host-binary/dist/windows-${TARGETARCH}/host-binary.exe /windows/host-binary.exe
 COPY host-binary/dist/darwin-${TARGETARCH}/host-binary /darwin/host-binary
 COPY host-binary/dist/linux-${TARGETARCH}/host-binary /linux/host-binary
 COPY --from=client-builder /ui/build ui
-COPY data /data
+#COPY data /data
 
-CMD ["/service", "-socket", "/run/guest-services/backend.sock"]
+#CMD ["/service", "-socket", "/run/guest-services/backend.sock"]

src/extension/Makefile

@@ -1,6 +1,6 @@
 # IMAGE?=docker/labs-ai-tools-for-devs
 IMAGE?=docker/labs-ai-tools-for-devs
-TAG?=0.2.39
+TAG?=0.2.41
 
 BUILDER=buildx-multi-arch
 

src/extension/docker-compose.yaml

@@ -1,14 +1,11 @@
 services:
-  dait:
-    image: ${DESKTOP_PLUGIN_IMAGE}
-    volumes:
-      - "data:/data"
   mcp_docker:
-    image: mcp/docker:0.0.11
+    image: mcp/docker:0.0.12
     ports:
       - 8811:8811
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/run/host-services/backend.sock:/backend.sock"
       - "docker-prompts:/prompts"
     command:
       - serve
@@ -18,5 +15,3 @@ services:
 volumes:
   docker-prompts:
     name: docker-prompts
-  data:
-    name: data

src/extension/metadata.json

@@ -1,10 +1,7 @@
 {
   "icon": "docker.svg",
   "vm": {
-    "composefile": "docker-compose.yaml",
-    "exposes": {
-      "socket": "backend.sock"
-    }
+    "composefile": "docker-compose.yaml"
   },
   "ui": {
     "dashboard-tab": {

test/docker_t.clj

@@ -1,6 +1,9 @@
 (ns docker-t
-  (:require [clojure.test :as t]
-            [docker]))
+  (:require
+   [clojure.test :as t]
+   [docker]
+   [jsonrpc.logger :as logger]
+   repl))
 
 (t/deftest port-parsing-tests
 
@@ -48,3 +51,13 @@
                     {:secrets {:notion.integration_secret "INTEGRATION_SECRET"}
                      :environment {"OPENAPI_MCP_HEADERS" "\"{\\\"Authorization\": \\\"Bearer $INTEGRATION_SECERET\\\", \\\"Notion-Version\\\": \\\"2022-06-28\\\"}\""}
                      :image "mcp/notion:latest"})))))
+
+(comment
+  (repl/setup-stdout-logger)
+  (docker/has-image? "alpine:latest")
+  (docker/get-login-info {})
+  (docker/-add-token {:image ""})
+  (try
+    (docker/check-then-pull {:image "alpine:latest"})
+    (catch Throwable t
+      (logger/info t))))