Start using git container

Author: slimslenderslacks

flake.nix

@@ -70,7 +70,7 @@
             # our application makes calls to the curl binary
             #  therefore, wrap the custom-jdk in a script with curl in the PATH
             entrypoint = pkgs.writeShellScriptBin "entrypoint" ''
-              export PATH=${pkgs.lib.makeBinPath [pkgs.curl pkgs.git]}
+              export PATH=${pkgs.lib.makeBinPath [pkgs.curl]}
               export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
               exec ${custom-jdk}/bin/agent-graph "$@"
             '';

graphs/prompts/journals/2024_09_03.md

@@ -66,6 +66,8 @@
               description: the glob pattern for files that should be found
       container:
           image: vonwig/findutils:latest
+          mounts:
+            - "/Users/slim/.ssh:/root/.ssh"
           command:
             - find
             - .

prompts/examples/git.md

@@ -1,3 +1,4 @@
+<!--
 ---
 tools:
   - name: append
@@ -34,16 +35,19 @@ tools:
        - "{{args|into}}"
 host-dir: /Users/slim/repo/bobloblaw
 ---
+-->
 
 # Background
 
 This shows how an agent can work with a _private_ git repository.
 
 This tests that we can clone and make a change to a private repo. The git container mounts a prepared .ssh directory and .gitconfig file. In order to try this one, you'll need to do 3 things.
 
-1. Create an empty directory on your host machine and update the `host-dir` parameter to point at it.  Make it empty.  The agent is going to clone into this.
-1. Update the two mounts in git tool entry. They need a valid .ssh and .gitconfig that are okay sharing with the git container (read-only).
-2. Update the prompt below to point at a private repo with a README.md that we can update.
+1. Update the `host-dir` entry in the above comment to point at a empty directory.  The agent is going to clone into this directory so start with an empty directory.
+1. Update the two mounts in git tool entry from the comment above. This is how you will provide credential access to the git container (read-only).
+2. Update the prompt in the section below to point at a private repo of your choosing.
+
+The next section contains the prompt that will be sent to the agent.  This is where the agent instructions begin.
 
 # prompt user
 

src/git.clj

@@ -1,9 +1,10 @@
 (ns git
   (:require
    [babashka.fs :as fs]
-   [babashka.process :as p]
+   [clojure.pprint :as pprint]
    [clojure.string :as string]
    dir
+   docker
    [hasch.core :as hasch]))
 
 (set! *warn-on-reflection* true)
@@ -55,35 +56,41 @@
        (fs/create-dirs default-dir)
        default-dir))))
 
+(defn pull [{:keys [dir ref]}]
+  (docker/run-container
+   {:image "alpine/git:latest"
+    :host-dir (str dir)
+    :command (concat ["pull" "origin"]
+                     (when ref [ref]))}))
+
+(defn clone [{:keys [dir owner repo ref ref-hash]}]
+  (docker/run-container
+   {:image "alpine/git:latest"
+    :host-dir (str dir)
+    :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
+                            (when ref ["-b" ref])
+                            [(format "/project/%s" ref-hash)])}))
+
 (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"
   [ref]
-  (when-let [{:keys [owner repo ref path] :as git-ref-map} (parse-github-ref ref)]
+  (when-let [{:keys [ref path] :as git-ref-map} (parse-github-ref ref)]
     (let [ref-hash (hashch (select-keys git-ref-map [:owner :repo :ref]))
           dir (fs/file (prompts-cache) ref-hash)
           _ (if (fs/exists? dir)
-              (-> (apply p/process
-                         {:dir dir}
-                         (concat
-                          ["git" "pull" "origin"]
-                          (when ref [ref])))
-                  (deref))
-              (-> (apply p/process
-                         {:dir (fs/parent dir)}
-                         (concat
-                          ["git" "clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
-                          (when ref ["-b" ref])
-                          [ref-hash]))
-                  (deref)
-                  (p/check)))]
+              (pull {:dir dir :ref ref})
+              (clone (merge git-ref-map {:dir (fs/parent dir) :ref-hash ref-hash})))]
       (if path
         (let [cached-path (fs/file dir path)]
           (if (fs/exists? cached-path)
             cached-path
             (throw (ex-info "repo exists but path does not" {:ref ref}))))
         dir))))
 
+(comment
+  (prompt-file "github:docker/labs-make-runbook?path=prompts/docker/prompt.md"))
+
 (comment
   (fs/create-dir (prompts-cache))
   (def x "github:docker/labs-make-runbook?ref=main&path=prompts/docker")