-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix error with merge composefile with networks… #983
Conversation
|
… and other cases too. Updating mergo fixes the bugs (but introduced a slight behaviour change that had to be fixed too) Signed-off-by: Vincent Demeester <vincent@sbr.pm>
6c8cb39
to
0122730
Compare
Upstream got merge (thx @imdario 😻), so this is now ready for review 😉 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
@thaJeztah Sweet. The same issue is present when defining volumes, is this solving that as well? |
@MetalArend volumes should also be addressed by this change, but perhaps if you have a minimal example to reproduce/test, that would be appreciated |
Small example: docker-compose.yml version: '3.4'
volumes:
app:
services:
bash:
image: bash
command: cat docker-compose.override.yml
volumes:
- app:/app
working_dir: /app docker-compose.override.yml version: '3.4'
volumes:
app:
driver: local
driver_opts:
o: bind
type: none
device: $PWD
|
Hi @MetalArend , is the issue solved from your side ? Having the same issue with volume merging on 18.09.7... |
@LaurentTrk feel free to open a new issue with steps to reproduce if it's not fixed (or if there's a regression) |
Thanks @thaJeztah , here it is : #1981 |
Thanks! I must admit that I don't recall if I tested @MetalArend's example at the time #983 (comment), so also possible it wasn't fixed for Volumes with this PR; having a new issue helps preventing it getting lost 🤗 |
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)
Updates mergo : darccio/mergo@ea74e01...cfcc6d7
Fixes #972
Needs darccio/mergo#79 to get in upstream 👼cc @dnephin
Signed-off-by: Vincent Demeester vincent@sbr.pm