Skip to content

Conversation

ndeloof
Copy link
Contributor

@ndeloof ndeloof commented Jun 30, 2025

What I did

s.dockerCli.DockerEndpoint().Host returns the engine URL as seen by client, which is only relevant an Unix/MacOS with a local docker engine. Waiting for engine to expose this information in some API, or implement this feature on its own, hard-coding /var/run/docker.sock offer a more reliable path for engine socket to be mounted in container, while not 100% guaranteed to succeed.

Related issue
see docker/cli#6157

(not mandatory) A picture of a cute animal, if possible in relation to what you did

@ndeloof ndeloof requested a review from a team as a code owner June 30, 2025 10:08
@ndeloof ndeloof requested a review from glours June 30, 2025 10:08
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@mikesir87
Copy link
Member

Built the modified Compose and tested on a Windows machine (arm64 on WSL) and confirmed the socket mount is working and that the credentials are injected into the container as expected.

@ndeloof ndeloof merged commit 51acc58 into docker:main Jun 30, 2025
26 checks passed
@ndeloof ndeloof deleted the use_api_socket branch June 30, 2025 16:52
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jul 6, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | minor | `v2.37.3` -> `v2.38.1` |

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.38.1`](https://github.com/docker/compose/releases/tag/v2.38.1)

[Compare Source](docker/compose@v2.38.0...v2.38.1)

#### What's Changed

##### ✨ Improvements

- implement `model_variable` by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#13001

##### ⚙️ Dependencies

- bump compose-go to version v2.7.1 by [@&#8203;glours](https://github.com/glours) in docker/compose#13000

**Full Changelog**: docker/compose@v2.38.0...v2.38.1

### [`v2.38.0`](https://github.com/docker/compose/releases/tag/v2.38.0)

[Compare Source](docker/compose@v2.37.3...v2.38.0)

#### What's Changed

##### ✨ Improvements

- introduce support for models by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12976
- Add volumes command by [@&#8203;leoperegrino](https://github.com/leoperegrino) in docker/compose#12954
- remove publish limitation on bind mount by [@&#8203;glours](https://github.com/glours) in docker/compose#12997
- mount /var/run/docker.sock for --use-api-socket by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12995

##### 🐛 Fixes

- only expose API socket to service asking for it by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12972
- check progress default value instead of empty string to use BUILDKIT\_PROGRESS env variable value by [@&#8203;glours](https://github.com/glours) in docker/compose#12982
- exclude provider services from the list of dependencies that Compose should wait for by [@&#8203;glours](https://github.com/glours) in docker/compose#12983
- don't fail down cmd if services with pre\_stop hook already stopped/removed by [@&#8203;glours](https://github.com/glours) in docker/compose#12986
- Swap to Reader in bake to avoid hangs on output by [@&#8203;nscott](https://github.com/nscott) in docker/compose#12984
- make sure the post\_start hooks fails by [@&#8203;glours](https://github.com/glours) in docker/compose#12996
- remove error message from exec outpout by default by [@&#8203;glours](https://github.com/glours) in docker/compose#12992
- fix: typos by [@&#8203;hezhizhen](https://github.com/hezhizhen) in docker/compose#12963
- pass project.environment to bake by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12994
- fix provider concurrent environment map accesses by [@&#8203;glours](https://github.com/glours) in docker/compose#12999
- e2e compose run --env by [@&#8203;ndeloof](https://github.com/ndeloof) in docker/compose#12967

##### ⚙️ Dependencies

- build(deps): bump github.com/docker/cli from 28.2.2+incompatible to 28.3.0+incompatible by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12974
- build(deps): bump github.com/docker/docker from 28.2.2+incompatible to 28.3.0+incompatible by [@&#8203;dependabot](https://github.com/dependabot) in docker/compose#12975

#### New Contributors

- [@&#8203;nscott](https://github.com/nscott) made their first contribution in docker/compose#12984
- [@&#8203;hezhizhen](https://github.com/hezhizhen) made their first contribution in docker/compose#12963
- [@&#8203;leoperegrino](https://github.com/leoperegrino) made their first contribution in docker/compose#12954

**Full Changelog**: docker/compose@v2.37.3...v2.38.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:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDAuNjIuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants