feat(install): rootless Docker offer disables the rootful daemon first
docker.service + docker.socket disabled and /var/run/docker.sock removed before dockerd-rootless-setuptool.sh install, as the docs recommend; skipped when no rootful unit exists.
This commit is contained in:
1 parent
6882aa7c14
commit
de6fa1659c
4 files changed
+11
-6
No files matched your search
@@ -125,4 +125,4 @@ Done: choose_macos_shell default bash → zsh (Enter, no tty, unknown value). Fo
|
||||
Done: `gitconfig` template `[gitflow] autopush = @AUTOPUSH@` + fixed `core.hooksPath = ~/.claude/githooks`; install.sh `resolve_autopush` (existing ~/.gitconfig value via sed → `DOTFILES_GITFLOW_AUTOPUSH` strict, bad value aborts → prompt re-asks exact true/false, Enter = true → true), `render_gitconfig` fail-closed (non-boolean / leaked placeholder = nothing written). Found by challenge: install.sh:688 passed the repo bashrc TEMPLATE to deploy_gitconfig → every install wrote `name = @USER@`; fixed, identity passed directly. `shopt -u patsub_replacement` (bash ≥ 5.2 `&` in names). Oracle harness `.claude/tasks/contracts/check-autopush-render.sh` (12 cases, scratch HOMEs, zero `git config`: that command family is denied to the session). 3 challengers + 1 confirm, verifier ECARTS(1) → CONFORME, security PASS (MEDIUM noted: newline in IDENTITY_* env injects gitconfig lines, pre-existing for rc too). Code commit 9901ec5 on feature/gitconfig-autopush; merge on user signal.
|
||||
|
||||
## 2026-10-09 — rootless Docker offered at install
|
||||
Done: `offer_docker_rootless()` (uidmap/dbus-user-session/slirp4netns/docker-ce-rootless-extras, `dockerd-rootless-setuptool.sh install` no --force, enable-linger, rootful daemon untouched), extras in install_docker list, bashrc-linux exports DOCKER_HOST only when the user socket exists (no PATH line: apt variant puts the tool in /usr/bin, not ~/bin). README step 16. Stub harness 4 cases + snippet with/without socket OK, shellcheck clean. Branch feature/docker-rootless, not merged. Machine state: rootless already set up by hand, rootful daemon still enabled, ~/.bashrc has a hardcoded uid 1000 DOCKER_HOST line (redeploy replaces it).
|
||||
Done: `offer_docker_rootless()` (uidmap/dbus-user-session/slirp4netns/docker-ce-rootless-extras, `dockerd-rootless-setuptool.sh install` no --force, enable-linger, rootful daemon disabled first as the docs recommend, user asked for it), extras in install_docker list, bashrc-linux exports DOCKER_HOST only when the user socket exists (no PATH line: apt variant puts the tool in /usr/bin, not ~/bin). README step 16. Stub harness 4 cases + snippet with/without socket OK, shellcheck clean. Branch feature/docker-rootless, not merged. Machine state: rootless already set up by hand, rootful daemon still enabled, ~/.bashrc has a hardcoded uid 1000 DOCKER_HOST line (redeploy replaces it).
|
||||
@@ -144,7 +144,7 @@ Branch: feature/gitconfig-autopush (off develop). Plan: .claude/tasks/plans/2026
|
||||
Branch: feature/docker-rootless (off develop). Mirrors the manual setup done on this machine
|
||||
(docs.docker.com/engine/security/rootless, apt variant: setuptool lives in /usr/bin, not ~/bin).
|
||||
- [x] install.sh: `docker-ce-rootless-extras` in the install_docker package list
|
||||
- [x] install.sh: offer_docker_rootless() — uidmap/dbus-user-session/slirp4netns + extras, setuptool install (no --force), enable-linger; rootful daemon left as is
|
||||
- [x] install.sh: offer_docker_rootless() — uidmap/dbus-user-session/slirp4netns + extras, setuptool install (no --force), enable-linger; rootful daemon disabled first
|
||||
- [x] bash/bashrc-linux: DOCKER_HOST exported only when the rootless socket exists (no PATH line: /usr/bin already on PATH)
|
||||
- [x] README.md: table row, step 2 packages, packages list, new offer step
|
||||
- [x] shellcheck + bash -n; commit on the feature branch. No finish without explicit signal.
|
||||
Reference in new issue
Block a user