Skip to content

Add Docker dev env with optional Ollama#352

Merged
AnaBerg merged 10 commits into
mainfrom
feat/docker-web-env
Jun 5, 2026
Merged

Add Docker dev env with optional Ollama#352
AnaBerg merged 10 commits into
mainfrom
feat/docker-web-env

Conversation

@AnaBerg

@AnaBerg AnaBerg commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator

Summary

Adds a local Docker dev environment with optional Ollama support while keeping external LLM providers easy to use for stronger model testing.

What changed

  • Adds Ollama to the dev Compose stack with persistent model storage and a make dev-ollama-pull helper.
  • Updates the dev hub config example and Docker docs for local-only Ollama testing and external-provider testing.
  • Supports ollama across hub-side AI config, streaming, failure summaries, settings, and doctor checks.
  • Uses OpenClaw native Ollama onboarding for Docker agents with http://ollama:11434 and strips the ollama/ model prefix.
  • Stabilizes Docker agent bootstrap by waiting for workspace files before starting OpenClaw bootstrap work.
  • Pins OpenClaw consistently and fails the agent image build if the pinned install fails.
  • Adds focused tests for Ollama provider selection, doctor checks, bootstrap flags/config, Docker copy behavior, and settings display.

Validation

  • docker run --rm -e GOFLAGS=-buildvcs=false -v "$PWD":/app -w /app golang:1.25 go test ./cmd/claw-bridge ./pkg/provider/docker ./pkg/hub ./pkg/types
  • docker compose -f docker/compose.dev.yml config
  • make dev-agent-build

npm run lint was also attempted, but it currently fails on existing repo-wide React hook lint errors unrelated to this change.

Linked issue

Closes #328

@AnaBerg AnaBerg changed the title [codex] Add Docker dev env with optional Ollama Add Docker dev env with optional Ollama Jun 4, 2026
@AnaBerg AnaBerg self-assigned this Jun 4, 2026
@AnaBerg AnaBerg force-pushed the feat/docker-web-env branch from 85d1f0c to 8eebce0 Compare June 4, 2026 18:08
Comment thread cmd/claw-bridge/main.go Outdated
@AnaBerg AnaBerg marked this pull request as ready for review June 4, 2026 19:53
@greptile-apps

greptile-apps Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Security Review

  • Secrets in Docker build cache (.dockerignore): docker/hub.dev.yaml — which holds real API keys for local development — is absent from .dockerignore. The agent Dockerfile's COPY . . builder stage sends the file to the Docker daemon and caches it in the intermediate builder image layer. While multi-stage builds prevent it from landing in the final image, the builder layer is stored locally and could expose secrets if the build cache is exported, shared in CI, or if someone runs docker save on it.

Reviews (1): Last reviewed commit: "fix: replace Ollama catalog patch script..." | Re-trigger Greptile

Comment thread .dockerignore
Comment thread pkg/hub/failure_summary.go Outdated
Comment thread docker/compose.dev.yml Outdated
Comment thread docker/hub.Dockerfile Outdated
Comment thread pkg/provider/docker/docker.go Outdated
@greptile-apps

greptile-apps Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Reviews (2): Last reviewed commit: "fix: address Docker dev review findings" | Re-trigger Greptile

@AnaBerg AnaBerg merged commit 1e10de3 into main Jun 5, 2026
11 checks passed
@AnaBerg AnaBerg deleted the feat/docker-web-env branch June 5, 2026 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

support docker as a sandbox provider

2 participants