Pull images without creds when not opted in

* Update curl prompts
* test pulling new function images after cleaning

Author: slimslenderslacks

dev/clean_local_images.clj

@@ -16,7 +16,14 @@
     "vonwig/fasttext"
     "vonwig/typos"
     "vonwig/what-is-my-ip"
-    "vonwig/findutils"})
+    "vonwig/findutils"
+    "vonwig/qrencode"
+    "vonwig/curl"
+    "vonwig/standardjs"
+    "vonwig/eslint"
+    "vonwig/git"
+    "vonwig/clj-kondo"
+    "vonwig/extractor-eslint"})
 
 (comment
   (docker/delete-image {:image "vonwig/function_write_files"}))

prompts/curl/100_user_prompts.md

@@ -1,3 +1,2 @@
-Run the curl command to fetch https://www.example.com
+Run the curl command to fetch gists for user slimslenderslacks from GitHub.
 
-If you get an error, run `curl --help` and use the output to try again.

prompts/curl/README.md

@@ -1,47 +1,26 @@
 ---
-extractors:
-  - name: linguist 
-  - name: project-facts
 model: gpt-4
 stream: true
 functions:
   - name: curl
-    description: "Run a curl command"
+    description: "Run a curl command."
     parameters:
       type: object
       properties:
         args:
-          type: string
-          description: "The arguments to pass to curl"
+           type: string
+           description: "The arguments to pass to curl"
     container:
       image: vonwig/curl:latest
 ---
 
 # Background
 
+Run curl commands.
+
+* read the contents of `curl --help`
 * read tl/dr examples
 * read man pages
 
-After ragging the above content, do we know enough about curl to create and run curl examples.
-
-Also, what about defining outcomes and having the tool verify that we actually ran this correctly and got the expected results?
-
-At the end, we should report the command line, and the version of curl that we used.
-
-## How to run
+After ragging the above content, do we know enough about curl to create and run curl examples?
 
-```sh
-# docker:command=curl
-docker run --rm -it \
-           -v /var/run/docker.sock:/var/run/docker.sock \
-           --mount type=volume,source=docker-prompts,target=/prompts \
-           --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
-           --mount type=bind,source=$PWD,target=/app/local \
-           --workdir /app \
-           vonwig/prompts:latest run \
-                                 --host-dir $PWD \
-                                 --user $USER \
-                                 --platform "$(uname -o)" \
-                                 --prompts-dir local
-                                 # "github:docker/labs-make-runbook?ref=main&path=prompts/curl"
-```

prompts/dockerfiles/README.md

@@ -17,10 +17,3 @@ These prompts add Dockerfile authoring skills to the assistant.
 * the [user prompts](100_user_prompt.md) direct the assist to extract details about the project, and then write a Dockerfile to the root of the project.
 * the [npm best practices](npm-best-practices.md) is are added to the system prompts whenever the assist detects that this is an NPM project.
 
-## functions
-
-These instructions in these prompts rely on 3 functions
-
-1. `analyze_project` - requires read-only access to the project and extracts details from the project to give the assistant context for authoring the Dockerfile
-2. `write_files` - has read-write access to the project and will write Dockerfiles so that developers don't have to copy and paste data out of a chat.
-3. `docker_scout_tag_recommendation` - uses Docker Scout to improve the choice tag selection during code generation.

runbook.md

@@ -158,8 +158,7 @@ docker run --rm \
                                  "$(uname -o)" \
                                  local/prompts/eslint \
                                  --pat "$(cat ~/.secrets/dockerhub-pat-ai-tools-for-devs.txt)" \
-                                 --thread-id "something" \
-                                 --save-thread-volume
+                                 --thread-id "something"
 ```
 
 # Test bad commands

src/docker.clj

@@ -25,16 +25,18 @@
 (defn pull-image [{:keys [image identity-token creds]}]
   (curl/post
    (format "http://localhost/images/create?fromImage=%s" image)
-   {:raw-args ["--unix-socket" "/var/run/docker.sock"]
-    :throw false
-    :headers {"X-Registry-Auth"
-              ;; I don't think we'll be pulling images
-              ;; from registries that support identity tokens
-              (-> (cond
-                    identity-token {:identitytoken identity-token}
-                    creds creds)
-                  (json/generate-string)
-                  (encode))}}))
+   (merge
+     {:raw-args ["--unix-socket" "/var/run/docker.sock"]
+      :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
+                  (-> (cond
+                        identity-token {:identitytoken identity-token}
+                        creds creds)
+                      (json/generate-string)
+                      (encode))}}))))
 
 (comment
   (let [pat (string/trim (slurp "/Users/slim/.secrets/dockerhub-pat-ai-tools-for-devs.txt"))]
@@ -100,8 +102,8 @@
 
 (defn remove-volume [{:keys [Name]}]
   (curl/delete (format "http://localhost/volumes/%s" Name)
-             {:raw-args ["--unix-socket" "/var/run/docker.sock"]
-              :throw false}))
+               {:raw-args ["--unix-socket" "/var/run/docker.sock"]
+                :throw false}))
 
 (defn inspect-container [{:keys [Id]}]
   (curl/get
@@ -174,10 +176,13 @@
                                             :req-un [::image]))
 
 (defn run-function [m]
-  (when (and (:user m) (and (not (:offline m)) (or (:pat m) (creds/credential-helper->jwt))))
-    (pull (assoc m :creds {:username (:user m)
-                           :password (or (:pat m) (creds/credential-helper->jwt))
-                           :serveraddress "https://index.docker.io/v1/"})))
+  (pull (merge m
+               {:serveraddress "https://index.docker.io/v1/"}
+               (let [jwt (creds/credential-helper->jwt)]
+                 (when (and (:user m)
+                            (or (:pat m) jwt))
+                   {:creds {:username (:user m)
+                            :password (or (:pat m) jwt)}}))))
   (let [x (create m)]
     (start x)
     (wait x)