Skip to content

Commit 321fd40

Browse files
committed
fx: drop the hardcoded rootless Docker ENV defaults
ENV always set DOCKER_HOST, so the ${DOCKER_HOST:-...} fallback in /etc/profile could never use its default. The profile now sets both variables, and a value from the environment is kept. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017jPxeenJt19PJStMMeb1Em
1 parent 3b51d99 commit 321fd40

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ daemon automatically. The host must permit nested user namespaces — in a Coder
132132
run the workspace container with `privileged = true` (or the equivalent `--userns` setup), and call
133133
`dockerd-rootless-start` from `startup_script` so Docker is ready on boot.
134134

135-
Both variables are defaults. If `DOCKER_HOST` is already set, the image and the script keep that
135+
Both variables are defaults. If `DOCKER_HOST` is already set, the profile and the script keep that
136136
value. The script starts no daemon if one answers there.
137137

138138
## Development

‎fx/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ ENV GOROOT=/usr/local/go
2020
ENV GOPATH=/home/coder/go
2121
ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
2222

23-
# Rootless Docker (docker-in-docker without privileged root).
24-
# Defaults. The environment can override them.
25-
ENV XDG_RUNTIME_DIR=/run/user/1000
26-
ENV DOCKER_HOST=unix:///run/user/1000/docker.sock
27-
2823
# T3 Code: opt out of telemetry by default
2924
ENV T3CODE_TELEMETRY_ENABLED=false
3025

0 commit comments

Comments
 (0)