Standardize on colima for macOS; retire Docker Desktop as a supported engine - #195
Merged
Merged
Conversation
… dockerd elsewhere ContainerEngine.resolve takes host_os (Dev::Deps.detect_host by default). With no record, darwin resolves the user's own colima VM — the one macOS engine whose whole lifecycle dev can own — and linux/windows resolve bare dockerd, where there is no VM to own. The :docker_desktop kind becomes :docker: a `docker` record is now the opt-out from the macOS default, bare docker with no env, reaching whatever daemon the CLI's context does. Docker Desktop is unsupported but not blocked (#185). Co-authored-by: Cursor <cursoragent@cursor.com>
Without Docker Desktop the docker CLI and its buildx plugin come from Homebrew, which drops the plugin under $(brew --prefix)/lib/docker/cli-plugins and expects a cliPluginsExtraDirs entry in ~/.docker/config.json. This owns that one line: merged into whatever the file already holds, idempotent, and never rewriting a config it cannot parse (#185). Co-authored-by: Cursor <cursoragent@cursor.com>
EngineProvisioner is up's engine half: resolve the engine for this host; leave an explicit DOCKER_HOST alone; on macOS wire the brew CLI's plugins and, for the colima default, start the VM sized from the repo's build.container.resources hint. Linux/WSL2 bare dockerd is a system service — nothing to start. UpCommand runs it after credentials and before the deps install, only when the project declares build.container. The ColimaProvisioner's wording stops calling the VM the agent's: it is the one macOS engine, for humans and agent accounts alike (#185). Co-authored-by: Cursor <cursoragent@cursor.com>
Dead since ContainerEngine stopped resolving a Desktop kind: nothing
constructed it, and its verify-only contract ("start Docker Desktop
yourself") is the opposite of what dev now does with the engine. The
runner status line stops calling colima the agent's engine (#185).
Co-authored-by: Cursor <cursoragent@cursor.com>
…Desktop (#185) Co-authored-by: Cursor <cursoragent@cursor.com>
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #185.
One supported container engine per host OS, and dev owns its lifecycle:
dev updocker-buildxinto the brewdockerCLI (cliPluginsExtraDirs, merged never clobbered), starts the VM sized frombuild.container.resourcesContainerEngine.resolvetakeshost_os:; no record → colima on darwin, bare:dockerelsewhere. Kind:docker_desktopis gone; adockerrecord is the opt-out to bare docker (Desktop users land here: unsupported, not blocked). ExplicitDOCKER_HOSTstill wins and is left alone.EngineProvisioner(up's engine half) andDockerCliPlugins(the config.json line).UpCommandruns it after credentials, before the deps install, only for projects declaringbuild.container.DockerDesktopProvisionerdeleted (dead code). Colima wording stops calling the VM "the agent's".Companion:
homebrew-d3mlabsdev-coregainsdepends_on colima docker docker-buildxsobrew upgradebrings the CLI and plugin Desktop used to provide. cellbound-3d / snappy Windows bootstraps move to dockerd inside the WSL2 distro in their own PRs.Not in scope:
dev engine up|down|statusand idle-stop (#187).Made with Cursor