pluginMain: remove uses of DockerCLI.Apply #13240
Merged
Conversation
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
The Apply method was added when CLI options for constructing the CLI were rewritten into functional options in [cli@7f207f3]. There was no mention in the pull request of this method specifically, and we want to remove or reduce functions that mutate the CLI configuration after initialization if possible (and likely remove the `Apply` method). This patch removes the use of the `Apply` function as an intermediate step; improvements will be made in the CLI itself for a more solid implementation. [cli@7f207f3]: docker/cli@7f207f3 Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
FWIW, manually verified it still applies as expected, as I wasn't sure there were tests for this; docker run -d --rm --name debugger -p 127.0.0.1:2375:8080 mendhak/http-https-echo
./bin/build/docker-compose -H tcp://localhost:2375 ps
no configuration file provided: not found
docker logs debugger
...
"headers": {
"host": "localhost:2375",
"user-agent": "compose/v2.39.4-4-g4761fd88b.m",
"traceparent": "00-27c84494c639321cc7268e62945a22e2-d028e97a1b306252-01",
"accept-encoding": "gzip"
}, |
ndeloof
approved these changes
Sep 24, 2025
This was referenced Sep 24, 2025
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Oct 10, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.39.4` -> `v2.40.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.40.0`](https://github.com/docker/compose/releases/tag/v2.40.0) [Compare Source](docker/compose@v2.39.4...v2.40.0) #### What's Changed ##### ✨ Improvements - publish Compose application as compose.yaml + images by [@​ndeloof](https://github.com/ndeloof) in [#​13257](docker/compose#13257) ##### 🐛 Fixes - resolve secrets based on env var before executing bake by [@​ndeloof](https://github.com/ndeloof) in [#​13237](docker/compose#13237) - pass bake secrets by env by [@​ndeloof](https://github.com/ndeloof) in [#​13249](docker/compose#13249) - escape $ in bake.json as interpolation already has been managed by cpmpose by [@​ndeloof](https://github.com/ndeloof) in [#​13259](docker/compose#13259) ##### 🔧 Internal - pkg/compose: remove uses of deprecated mitchellh/mapstructure module by [@​thaJeztah](https://github.com/thaJeztah) in [#​13239](docker/compose#13239) - pkg/watch: remove unused IsWindowsShortReadError by [@​thaJeztah](https://github.com/thaJeztah) in [#​13052](docker/compose#13052) - pkg/compose: build: remove permissions warning on Windows by [@​thaJeztah](https://github.com/thaJeztah) in [#​13236](docker/compose#13236) - pluginMain: remove uses of DockerCLI.Apply by [@​thaJeztah](https://github.com/thaJeztah) in [#​13240](docker/compose#13240) - use containerd registry client by [@​ndeloof](https://github.com/ndeloof) in [#​13245](docker/compose#13245) - provider services: use '--project-name=' notation by [@​glours](https://github.com/glours) in [#​13250](docker/compose#13250) - gha: update test-matrix: remove docker 26.x by [@​thaJeztah](https://github.com/thaJeztah) in [#​13254](docker/compose#13254) - pkg/compose: explicitly map AuthConfig fields instead of a direct cast by [@​thaJeztah](https://github.com/thaJeztah) in [#​13253](docker/compose#13253) - cmd/compose: fix minor linting issues by [@​thaJeztah](https://github.com/thaJeztah) in [#​13252](docker/compose#13252) - use containerd client for OCI operations by [@​ndeloof](https://github.com/ndeloof) in [#​13251](docker/compose#13251) ##### ⚙️ Dependencies - build(deps): bump github.com/docker/docker, docker/cli v28.5.0-rc.1 by [@​thaJeztah](https://github.com/thaJeztah) in [#​13241](docker/compose#13241) - build(deps): bump github.com/docker/docker from 28.5.0-rc.1+incompatible to 28.5.0+incompatible by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13260](docker/compose#13260) - build(deps): bump github.com/docker/cli from 28.5.0-rc.1+incompatible to 28.5.0+incompatible by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13261](docker/compose#13261) **Full Changelog**: <docker/compose@v2.39.4...v2.40.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMzIuNSIsInVwZGF0ZWRJblZlciI6IjQxLjEzMi41IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
relates to:
pluginMain: remove uses of DockerCLI.Apply
The Apply method was added when CLI options for constructing the CLI were rewritten into functional options in cli@7f207f3. There was no mention in the pull request of this method specifically, and we want to remove or reduce functions that mutate the CLI configuration after initialization if possible (and likely remove the
Applymethod).This patch removes the use of the
Applyfunction as an intermediate step; improvements will be made in the CLI itself for a more solid implementation.What I did
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did