From 3b51d9969ec4f3eb7a4ed39dab8a20aa3f28b40b Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 10 Aug 2026 19:10:42 +0000 Subject: [PATCH 1/2] all: install the nano editor Add nano to every image and check it in the common smoke test. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_017jPxeenJt19PJStMMeb1Em --- Makefile | 1 + fx/Dockerfile | 2 +- golang/Dockerfile | 2 +- nodejs/Dockerfile | 2 +- php/Dockerfile | 2 +- python/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 22cab73..0ba9e83 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ _testcase-t3code: .PHONY: _testcase-common _testcase-common: $(TEST_RUN) tmux -V + $(TEST_RUN) nano --version $(TEST_RUN) agent-browser --version $(TEST_RUN) gh --version $(TEST_RUN) glab --version diff --git a/fx/Dockerfile b/fx/Dockerfile index 57f118b..cd1c18d 100644 --- a/fx/Dockerfile +++ b/fx/Dockerfile @@ -50,7 +50,7 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y --no-install-recommends \ - git jq ripgrep tmux \ + git jq ripgrep tmux nano \ # Node nodejs \ # PHP diff --git a/golang/Dockerfile b/golang/Dockerfile index 0c492dd..7eb5940 100644 --- a/golang/Dockerfile +++ b/golang/Dockerfile @@ -31,7 +31,7 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y --no-install-recommends \ - git jq ripgrep tmux nodejs gh \ + git jq ripgrep tmux nano nodejs gh \ # Chrome libs (agent-browser) libnspr4 libnss3 libatk-bridge2.0-0 libdrm2 libxkbcommon0 libatspi2.0-0 \ libcups2t64 libxshmfence1 libgbm1 libpango-1.0-0 libpangocairo-1.0-0 \ diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile index 0322e2c..35ad883 100644 --- a/nodejs/Dockerfile +++ b/nodejs/Dockerfile @@ -31,7 +31,7 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y --no-install-recommends \ - git jq ripgrep tmux nodejs gh \ + git jq ripgrep tmux nano nodejs gh \ # Chrome libs (agent-browser) libnspr4 libnss3 libatk-bridge2.0-0 libdrm2 libxkbcommon0 libatspi2.0-0 \ libcups2t64 libxshmfence1 libgbm1 libpango-1.0-0 libpangocairo-1.0-0 \ diff --git a/php/Dockerfile b/php/Dockerfile index 2bda237..b56d36e 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -28,7 +28,7 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y --no-install-recommends \ - git jq ripgrep tmux nodejs \ + git jq ripgrep tmux nano nodejs \ # PHP php8.5-cli php8.5-common php8.5-curl php8.5-gd php8.5-intl \ php8.5-mailparse php8.5-mbstring php8.5-mysql php8.5-pgsql php8.5-phpdbg \ diff --git a/python/Dockerfile b/python/Dockerfile index f34ae51..2df7af2 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -27,7 +27,7 @@ RUN \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y --no-install-recommends \ - git jq ripgrep tmux nodejs gh \ + git jq ripgrep tmux nano nodejs gh \ # Python python3 python3-pip python3-venv \ # Chrome libs (agent-browser) From 321fd40d3cc4bf840e38021b227b95488e9880d6 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 10 Aug 2026 19:22:46 +0000 Subject: [PATCH 2/2] 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 Claude-Session: https://claude.ai/code/session_017jPxeenJt19PJStMMeb1Em --- README.md | 2 +- fx/Dockerfile | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 23cd609..f9230bf 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ daemon automatically. The host must permit nested user namespaces — in a Coder run the workspace container with `privileged = true` (or the equivalent `--userns` setup), and call `dockerd-rootless-start` from `startup_script` so Docker is ready on boot. -Both variables are defaults. If `DOCKER_HOST` is already set, the image and the script keep that +Both variables are defaults. If `DOCKER_HOST` is already set, the profile and the script keep that value. The script starts no daemon if one answers there. ## Development diff --git a/fx/Dockerfile b/fx/Dockerfile index cd1c18d..cabcfe0 100644 --- a/fx/Dockerfile +++ b/fx/Dockerfile @@ -20,11 +20,6 @@ ENV GOROOT=/usr/local/go ENV GOPATH=/home/coder/go ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH -# Rootless Docker (docker-in-docker without privileged root). -# Defaults. The environment can override them. -ENV XDG_RUNTIME_DIR=/run/user/1000 -ENV DOCKER_HOST=unix:///run/user/1000/docker.sock - # T3 Code: opt out of telemetry by default ENV T3CODE_TELEMETRY_ENABLED=false