Only override service mac if set on the main network. #12439
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
apollo13
force-pushed
the
fb-container-mac
branch
from
897531f to
5d5a736
Compare
apollo13
force-pushed
the
fb-container-mac
branch
from
5d5a736 to
7ea49aa
Compare
ndeloof
approved these changes
Jan 7, 2025
Signed-off-by: Florian Apolloner <florian@apolloner.eu>
apollo13
force-pushed
the
fb-container-mac
branch
from
7ea49aa to
97e8a07
Compare
|
Thank you for the quasi instant turnaround @ndeloof. Much appreciated. I guess asking for a new point release is a bit much given there was one an hour ago? 😀 Do you have a rough idea when you want to do the next release? I am asking because then I'd know whether I will just put my podman PRs on hold for now or look for a workaround in the meantime. No pressure though, if you can give me an educated guess that would be more than helpful!
…On Tue, Jan 7, 2025, at 16:16, Nicolas De loof wrote:
Merged #12439 <#12439> into main.
—
Reply to this email directly, view it on GitHub
<#12439 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAT5C7TU5AUVAMKRBE2M4T2JPVWNAVCNFSM6AAAAABUXJ3UXGVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJVHA2DAMZUGEZDSNI>.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Jan 26, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | patch | `v2.32.2` -> `v2.32.4` | 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.4`](https://github.com/docker/compose/releases/tag/v2.32.4) [Compare Source](docker/compose@v2.32.3...v2.32.4) #### What's Changed This release fixes the version issue of `v2.32.3` ##### 🔧 Internal - ci: use local source for binary builds by [@​crazy-max](https://github.com/crazy-max) in docker/compose#12470 - ci: re-use local source to build binary images by [@​glours](https://github.com/glours) in docker/compose#12471 - add missing tag for build during merge workflow by [@​glours](https://github.com/glours) in docker/compose#12473 **Full Changelog**: docker/compose@v2.32.3...v2.32.4 ### [`v2.32.3`](https://github.com/docker/compose/releases/tag/v2.32.3) [Compare Source](docker/compose@v2.32.2...v2.32.3) #### What's Changed⚠️ This release don't display properly its version! Instead of displaying the tag the `docker compose version` display its commit hash. ##### 🐛 Fixes - Only override service mac if set on the main network. by [@​apollo13](https://github.com/apollo13) [(12439)](docker/compose#12439) - Exclude one-off container running convergence by [@​ndeloof](https://github.com/ndeloof) [(12441)](docker/compose#12441) - Can't render progress concurrently with buildkit by [@​ndeloof](https://github.com/ndeloof) [(12442)](docker/compose#12442) - Image can be set to a local ID, that isn't a valid docker ref by [@​ndeloof](https://github.com/ndeloof) [(12446)](docker/compose#12446) ##### 🔧 Internal - CI: update bake-action to v6 by [@​crazy-max](https://github.com/crazy-max) [(12452)](docker/compose#12452) - Simplification by [@​ndeloof](https://github.com/ndeloof) [(12451)](docker/compose#12451) **Full Changelog**: docker/compose@v2.32.2...v2.32.3 </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:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMjIuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEyMi4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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
I am using compose against podman which exposes API 1.41 and as such does not yet support mac per network. But the existing code unconditionally overrides the mac address set on the service level with the mac from the main network even if none is defined -- hence only override if it is actually set.
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did