don't fail down cmd if services with pre_stop hook already stopped/removed #12986
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
ndeloof
reviewed
Jun 27, 2025
pkg/compose/hook.go
Outdated
| @@ -52,6 +53,10 @@ func (s composeService) runHook(ctx context.Context, ctr container.Summary, serv | |||
| AttachStderr: !detached, | |||
| }) | |||
| if err != nil { | |||
| // Ignore errors indicating that some containers were already stopped or removed. | |||
There was a problem hiding this comment.
as runHook is only used in 2 places, and this applies to the stopContainer case, maybe we could check this error in stopContainer caller function and avoid a custom extension?
(this will also cover a race conditions where container is removed after exec was created but before attach/start
a5cdf1a to
ebff485
Compare
ebff485 to
5ac821b
Compare
…moved Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
5ac821b to
7d7c0c6
Compare
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 [@​ndeloof](https://github.com/ndeloof) in docker/compose#13001 ##### ⚙️ Dependencies - bump compose-go to version v2.7.1 by [@​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 [@​ndeloof](https://github.com/ndeloof) in docker/compose#12976 - Add volumes command by [@​leoperegrino](https://github.com/leoperegrino) in docker/compose#12954 - remove publish limitation on bind mount by [@​glours](https://github.com/glours) in docker/compose#12997 - mount /var/run/docker.sock for --use-api-socket by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12995 ##### 🐛 Fixes - only expose API socket to service asking for it by [@​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 [@​glours](https://github.com/glours) in docker/compose#12982 - exclude provider services from the list of dependencies that Compose should wait for by [@​glours](https://github.com/glours) in docker/compose#12983 - don't fail down cmd if services with pre\_stop hook already stopped/removed by [@​glours](https://github.com/glours) in docker/compose#12986 - Swap to Reader in bake to avoid hangs on output by [@​nscott](https://github.com/nscott) in docker/compose#12984 - make sure the post\_start hooks fails by [@​glours](https://github.com/glours) in docker/compose#12996 - remove error message from exec outpout by default by [@​glours](https://github.com/glours) in docker/compose#12992 - fix: typos by [@​hezhizhen](https://github.com/hezhizhen) in docker/compose#12963 - pass project.environment to bake by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12994 - fix provider concurrent environment map accesses by [@​glours](https://github.com/glours) in docker/compose#12999 - e2e compose run --env by [@​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 [@​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 [@​dependabot](https://github.com/dependabot) in docker/compose#12975 #### New Contributors - [@​nscott](https://github.com/nscott) made their first contribution in docker/compose#12984 - [@​hezhizhen](https://github.com/hezhizhen) made their first contribution in docker/compose#12963 - [@​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
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
Check error type returned by engine and continue if the container with
pre_stophook is already stopped or removedAdded e2e tests for both
pre_stopandpost_starthooksRelated issue
fix #12978
(not mandatory) A picture of a cute animal, if possible in relation to what you did
