dockerimg: add 'apk add grep'
Claude wants to use lots of grep features that the busybox version lacks.
Co-Authored-By: sketch <hello@sketch.dev>
diff --git a/dockerimg/testdata/testcreatedockerfile_empty_repo.httprr b/dockerimg/testdata/testcreatedockerfile_empty_repo.httprr
index 536e132..4f3f23a 100644
--- a/dockerimg/testdata/testcreatedockerfile_empty_repo.httprr
+++ b/dockerimg/testdata/testcreatedockerfile_empty_repo.httprr
@@ -1,9 +1,9 @@
httprr trace v1
-2915 1796
+2920 1636
POST https://api.anthropic.com/v1/messages HTTP/1.1
Host: api.anthropic.com
User-Agent: Go-http-client/1.1
-Content-Length: 2718
+Content-Length: 2723
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 {{.From}}\n\nRUN apk add bash git make jq sqlite gcc musl-dev linux-headers npm nodejs go github-cli ripgrep fzf python3 curl vim\n\nENV GOTOOLCHAIN=auto\nENV GOPATH=/go\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\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. For a minimal env, prefer golang:1.24.2-alpine3.21 as a base image.\n- If any python is needed at all, switch to using a python alpine image as a the base and apk add go.\n Favor using uv, and use one of these base images, depending on the preferred python version:\n ghcr.io/astral-sh/uv:python3.13-alpine\n ghcr.io/astral-sh/uv:python3.12-alpine\n ghcr.io/astral-sh/uv:python3.11-alpine\n- When using pip to install packages, use: uv pip install --system.\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 apk add commands in case the package does not exist.\n- Do NOT expose any ports.\n- Do NOT generate any CMD or ENTRYPOINT extra commands.\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 {{.From}}\n\nRUN apk add bash git make jq sqlite gcc musl-dev linux-headers npm nodejs go github-cli ripgrep fzf python3 curl vim grep\n\nENV GOTOOLCHAIN=auto\nENV GOPATH=/go\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\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. For a minimal env, prefer golang:1.24.2-alpine3.21 as a base image.\n- If any python is needed at all, switch to using a python alpine image as a the base and apk add go.\n Favor using uv, and use one of these base images, depending on the preferred python version:\n ghcr.io/astral-sh/uv:python3.13-alpine\n ghcr.io/astral-sh/uv:python3.12-alpine\n ghcr.io/astral-sh/uv:python3.11-alpine\n- When using pip to install packages, use: uv pip install --system.\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 apk add commands in case the package does not exist.\n- Do NOT expose any ports.\n- Do NOT generate any CMD or ENTRYPOINT extra commands.\n"
},
{
"type": "text",
@@ -54,24 +54,24 @@
}HTTP/2.0 200 OK
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-26T03:40:19Z
+Anthropic-Ratelimit-Input-Tokens-Remaining: 194000
+Anthropic-Ratelimit-Input-Tokens-Reset: 2025-04-30T00:05:25Z
Anthropic-Ratelimit-Output-Tokens-Limit: 80000
Anthropic-Ratelimit-Output-Tokens-Remaining: 80000
-Anthropic-Ratelimit-Output-Tokens-Reset: 2025-04-26T03:40:24Z
+Anthropic-Ratelimit-Output-Tokens-Reset: 2025-04-30T00:05:25Z
Anthropic-Ratelimit-Requests-Limit: 4000
Anthropic-Ratelimit-Requests-Remaining: 3999
-Anthropic-Ratelimit-Requests-Reset: 2025-04-26T03:40:17Z
+Anthropic-Ratelimit-Requests-Reset: 2025-04-30T00:05:23Z
Anthropic-Ratelimit-Tokens-Limit: 280000
-Anthropic-Ratelimit-Tokens-Remaining: 280000
-Anthropic-Ratelimit-Tokens-Reset: 2025-04-26T03:40:19Z
+Anthropic-Ratelimit-Tokens-Remaining: 274000
+Anthropic-Ratelimit-Tokens-Reset: 2025-04-30T00:05:25Z
Cf-Cache-Status: DYNAMIC
-Cf-Ray: 93630ed0fa52172e-SJC
+Cf-Ray: 9382c9831ccccf26-SJC
Content-Type: application/json
-Date: Sat, 26 Apr 2025 03:40:24 GMT
-Request-Id: req_011CNWedYcpggjUWkBMhQQVQ
+Date: Wed, 30 Apr 2025 00:05:25 GMT
+Request-Id: req_011CNdwUi47PqUjZW7hHn2o7
Server: cloudflare
Via: 1.1 google
X-Robots-Tag: none
-{"id":"msg_01PChHSQkt21DEvvMyJne1Xf","type":"message","role":"assistant","model":"claude-3-7-sonnet-20250219","content":[{"type":"text","text":"Based on your request, I'll call the dockerfile tool to create a Dockerfile for a Go project using golang:1.24.2-alpine3.21 as the base image. Since you haven't mentioned any Python requirements, I'll stick with the Go Alpine image as the base."},{"type":"tool_use","id":"toolu_017s6Lem8FXfK7uStmC8Ymby","name":"dockerfile","input":{"from":"golang:1.24.2-alpine3.21","extra_cmds":"RUN apk add --no-cache protoc protobuf-dev || true\nRUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest\nRUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest"}}],"stop_reason":"tool_use","stop_sequence":null,"usage":{"input_tokens":1006,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":212}}
\ No newline at end of file
+{"id":"msg_01BF34UhYywuD1464hxcgNgU","type":"message","role":"assistant","model":"claude-3-7-sonnet-20250219","content":[{"type":"text","text":"I'll call the dockerfile tool to create a Dockerfile based on your requirements. Since this is primarily a Go project, I'll use the golang:1.24.2-alpine3.21 base image as you suggested."},{"type":"tool_use","id":"toolu_017G4xedegtBeb1iMmjvyejf","name":"dockerfile","input":{"from":"golang:1.24.2-alpine3.21","extra_cmds":"RUN apk add --no-cache python3 py3-pip || true\nRUN pip3 install --upgrade pip || true"}}],"stop_reason":"tool_use","stop_sequence":null,"usage":{"input_tokens":1007,"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"output_tokens":159}}
\ No newline at end of file