dockerimg: restore sketch_context docker label
The sketch_context label was removed in commit 2a5bd6d (switch to debian base image)
but the code that reads this label in findOrBuildDockerImage was left intact.
This was causing Docker to always rebuild images since the label it was checking
for no longer existed in the Dockerfile template.
Restore the label and updates the template.Execute call to pass the required
InitFilesHash parameter.
Updates #43
diff --git a/dockerimg/testdata/testcreatedockerfile_basic_repo_with_readme.httprr b/dockerimg/testdata/testcreatedockerfile_basic_repo_with_readme.httprr
index f3b15f6..1652de8 100644
--- a/dockerimg/testdata/testcreatedockerfile_basic_repo_with_readme.httprr
+++ b/dockerimg/testdata/testcreatedockerfile_basic_repo_with_readme.httprr
@@ -1,9 +1,9 @@
httprr trace v1
-2637 1843
+2682 2107
POST https://api.anthropic.com/v1/messages HTTP/1.1
Host: api.anthropic.com
User-Agent: Go-http-client/1.1
-Content-Length: 2440
+Content-Length: 2485
Anthropic-Version: 2023-06-01
Content-Type: application/json
@@ -15,7 +15,7 @@
"content": [
{
"type": "text",
- "text": "\nCall the dockerfile tool to create a Dockerfile.\nThe parameters to dockerfile fill out the From and ExtraCmds\ntemplate variables in the following Go template:\n\n```\nFROM golang:1.24-bookworm\n\nRUN set -eux; \\\n\tapt-get update; \\\n\tapt-get install -y --no-install-recommends \\\n\t\tgit jq sqlite3 npm nodejs gh ripgrep fzf python3 curl vim\n\nENV PATH=\"$GOPATH/bin:$PATH\"\n\nRUN go install golang.org/x/tools/cmd/goimports@latest\nRUN go install golang.org/x/tools/gopls@latest\nRUN go install mvdan.cc/gofumpt@latest\n\nENV GOTOOLCHAIN=auto\n\nRUN mkdir -p /root/.cache/sketch/webui\n\nARG GIT_USER_EMAIL\nARG GIT_USER_NAME\n\nRUN git config --global user.email \"$GIT_USER_EMAIL\" \u0026\u0026 \\\n git config --global user.name \"$GIT_USER_NAME\"\n\nCOPY . /app\n\nWORKDIR /app{{.SubDir}}\nRUN if [ -f go.mod ]; then go mod download; fi\n\n{{.ExtraCmds}}\n\nCMD [\"/bin/sketch\"]\n\n```\n\nIn particular:\n- Assume it is primarily a Go project.\n- Python env setup is challenging and often no required, so any RUN commands involving python tooling should be written to let docker build continue if there is a failure.\n- Include any tools particular to this repository that can be inferred from the given context.\n- Append || true to any apt-get install commands in case the package does not exist.\n- MINIMIZE the number of extra_cmds generated. Straightforward environments do not need any.\n- Do NOT expose any ports.\n- Do NOT generate any CMD or ENTRYPOINT extra commands.\nHere is the content of several files from the repository that may be relevant:\n\n"
+ "text": "\nCall the dockerfile tool to create a Dockerfile.\nThe parameters to dockerfile fill out the From and ExtraCmds\ntemplate variables in the following Go template:\n\n```\nFROM golang:1.24-bookworm\n\nRUN set -eux; \\\n\tapt-get update; \\\n\tapt-get install -y --no-install-recommends \\\n\t\tgit jq sqlite3 npm nodejs gh ripgrep fzf python3 curl vim\n\nENV PATH=\"$GOPATH/bin:$PATH\"\n\nRUN go install golang.org/x/tools/cmd/goimports@latest\nRUN go install golang.org/x/tools/gopls@latest\nRUN go install mvdan.cc/gofumpt@latest\n\nENV GOTOOLCHAIN=auto\n\nRUN mkdir -p /root/.cache/sketch/webui\n\nARG GIT_USER_EMAIL\nARG GIT_USER_NAME\n\nRUN git config --global user.email \"$GIT_USER_EMAIL\" \u0026\u0026 \\\n git config --global user.name \"$GIT_USER_NAME\"\n\nLABEL sketch_context=\"{{.InitFilesHash}}\"\nCOPY . /app\n\nWORKDIR /app{{.SubDir}}\nRUN if [ -f go.mod ]; then go mod download; fi\n\n{{.ExtraCmds}}\n\nCMD [\"/bin/sketch\"]\n\n```\n\nIn particular:\n- Assume it is primarily a Go project.\n- Python env setup is challenging and often no required, so any RUN commands involving python tooling should be written to let docker build continue if there is a failure.\n- Include any tools particular to this repository that can be inferred from the given context.\n- Append || true to any apt-get install commands in case the package does not exist.\n- MINIMIZE the number of extra_cmds generated. Straightforward environments do not need any.\n- Do NOT expose any ports.\n- Do NOT generate any CMD or ENTRYPOINT extra commands.\nHere is the content of several files from the repository that may be relevant:\n\n"
},
{
"type": "text",
@@ -54,23 +54,23 @@
Anthropic-Organization-Id: 3c473a21-7208-450a-a9f8-80aebda45c1b
Anthropic-Ratelimit-Input-Tokens-Limit: 200000
Anthropic-Ratelimit-Input-Tokens-Remaining: 200000
-Anthropic-Ratelimit-Input-Tokens-Reset: 2025-04-30T22:04:05Z
+Anthropic-Ratelimit-Input-Tokens-Reset: 2025-05-01T01:25:07Z
Anthropic-Ratelimit-Output-Tokens-Limit: 80000
Anthropic-Ratelimit-Output-Tokens-Remaining: 80000
-Anthropic-Ratelimit-Output-Tokens-Reset: 2025-04-30T22:04:08Z
+Anthropic-Ratelimit-Output-Tokens-Reset: 2025-05-01T01:25:10Z
Anthropic-Ratelimit-Requests-Limit: 4000
Anthropic-Ratelimit-Requests-Remaining: 3999
-Anthropic-Ratelimit-Requests-Reset: 2025-04-30T22:04:04Z
+Anthropic-Ratelimit-Requests-Reset: 2025-05-01T01:25:01Z
Anthropic-Ratelimit-Tokens-Limit: 280000
Anthropic-Ratelimit-Tokens-Remaining: 280000
-Anthropic-Ratelimit-Tokens-Reset: 2025-04-30T22:04:05Z
+Anthropic-Ratelimit-Tokens-Reset: 2025-05-01T01:25:07Z
Cf-Cache-Status: DYNAMIC
-Cf-Ray: 938a55312bd8cf05-SJC
+Cf-Ray: 938b7b884d569e5c-SJC
Content-Type: application/json
-Date: Wed, 30 Apr 2025 22:04:08 GMT
-Request-Id: req_011CNfg371XDAe1Y9gVyKpwj
+Date: Thu, 01 May 2025 01:25:10 GMT
+Request-Id: req_011CNfwMpHE5n9J4LcvUc9cj
Server: cloudflare
Via: 1.1 google
X-Robots-Tag: none
-{"id":"msg_01PkvGHd4a2yx34TunMEGznA","type":"message","role":"assistant","model":"claude-3-7-sonnet-20250219","content":[{"type":"text","text":"I'll help you create a Dockerfile for this Go project. Based on the template and the README.md, this appears to be a simple Go testing project. Since the project details are minimal, I'll keep the extra commands minimal as well."},{"type":"tool_use","id":"toolu_01PQ5Bzm1WMMfdUoYoF1YJpx","name":"dockerfile","input":{"extra_cmds":"RUN go install golang.org/x/tools/cmd/stringer@latest\n\n# Install any potentially useful development tools\nRUN apt-get install -y --no-install-recommends gcc build-essential make || true\n\n# Try to setup Python environment if needed\nRUN python3 -m pip install --upgrade pip || true"}}],"stop_reason":"tool_use","stop_sequence":null,"usage":{"input_tokens":888,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":177}}
\ No newline at end of file
+{"id":"msg_01QtM6gyruMykGCZnqpZFWom","type":"message","role":"assistant","model":"claude-3-7-sonnet-20250219","content":[{"type":"text","text":"I'll help you create a Dockerfile for this Go project. Based on the template and files provided, this appears to be a simple Go test project without any special requirements beyond the standard Go development environment already included in the template.\n\nLooking at the contents of README.md, there's no indication of any special tools or dependencies beyond what's already in the template. The template already includes:\n- Go tooling (goimports, gopls, gofumpt)\n- Common development tools (git, jq, sqlite3, npm, nodejs, gh, ripgrep, fzf, etc.)\n\nSince this is a straightforward Go project without any special requirements inferred from the context, I'll call the dockerfile tool with minimal extra commands:"},{"type":"tool_use","id":"toolu_01WkcBWmnnsMdRBZz2sjJC81","name":"dockerfile","input":{"extra_cmds":"# No additional setup required for this simple Go test project"}}],"stop_reason":"tool_use","stop_sequence":null,"usage":{"input_tokens":903,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":224}}
\ No newline at end of file