only check volume mounts for updated config #12386
Merged
Conversation
This file contains 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
Signed-off-by: Nicolas De Loof <[email protected]>
ndeloof
requested review from
a team and
glours
and removed request for
a team
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Dec 20, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.31.0` -> `v2.32.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.32.1`](https://github.com/docker/compose/releases/tag/v2.32.1) [Compare Source](docker/compose@v2.32.0...v2.32.1) #### What's Changed ##### 🐛 Fixes - only check volume mounts for updated config by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12386 - e2e test to prevent future regression by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12389 **Full Changelog**: docker/compose@v2.32.0...v2.32.1 ### [`v2.32.0`](https://github.com/docker/compose/releases/tag/v2.32.0) [Compare Source](docker/compose@v2.31.0...v2.32.0) #### What's Changed ##### ✨ Improvements - build with bake by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12344 - introduce watch restart action by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12375 - introduce sync+exec watch action by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12330 - Recreate container on volume configuration change by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12363 ##### 🐛 Fixes - fix support for service.mac_address by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12371 - pull --quiet should not drop status message, only progress by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12358 - do not require a build section but for `rebuild` action by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12343 - log configuration error as a watch log event by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12359 ##### 🔧 Internal - disable failing TestBuildSSH test by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12349 - Make e2e tests pass locally by [@​glours](https://github.com/glours) in docker/compose#12348 ##### ⚙️ Dependencies - bump docker + buildx to latest release by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12372 - bump otel dependencies to v1.28.0 and v0.53.0 to align with buildx, buildkit and engine versions by [@​glours](https://github.com/glours) in docker/compose#12338 - build(deps): bump golang.org/x/sys from 0.27.0 to 0.28.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12378 - build(deps): bump golang.org/x/crypto from 0.27.0 to 0.31.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12377 - build(deps): bump google.golang.org/grpc from 1.68.0 to 1.68.1 by [@​dependabot](https://github.com/dependabot) in docker/compose#12353 - build(deps): bump golang.org/x/sync from 0.9.0 to 0.10.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12352 - update xx to v1.6.1 for compatibility with alpine 3.21 and file 5.46+ by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12366 **Full Changelog**: docker/compose@v2.31.0...v2.32.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:eyJjcmVhdGVkSW5WZXIiOiIzOS42NC4wIiwidXBkYXRlZEluVmVyIjoiMzkuNjkuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What I did
Compose uses a config hash to detect service need to be recreated, but as compose file uses reference names for volumes (which may be != volume name), we have to check if service volume is actually used to mount the desired volume.
This only has to apply to
volumemounts, where this reference ambiguity exisrts - otherwise we detect a false positive and recreate container while it's up-to-date.Related issue
fixes #12383
(not mandatory) A picture of a cute animal, if possible in relation to what you did
