Fix error with merge composefile with networks…

[vdemeester]

… 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

[silvin-lubecki]

@vdemeester

• linter is 😠 cli/compose/loader/merge_test.go:1::warning: file is not gofmted with -s (gofmt)
• so is the vendoring

scripts/validate/check-git-diff vendor

These files were changed:

 M vendor/github.com/imdario/mergo/merge.go

[vdemeester]

Upstream got merge (thx @imdario 😻), so this is now ready for review 😉

[silvin-lubecki]

LGTM

[thaJeztah]

LGTM, thanks!

[MetalArend]

@thaJeztah Sweet. The same issue is present when defining volumes, is this solving that as well?

[thaJeztah]

@MetalArend volumes should also be addressed by this change, but perhaps if you have a minimal example to reproduce/test, that would be appreciated

[MetalArend]

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

docker stack deploy --compose-file docker-compose.yml --compose-file docker-compose.override.yml test

[LaurentTrk]

@thaJeztah Sweet. The same issue is present when defining volumes, is this solving that as well?

Hi @MetalArend , is the issue solved from your side ? Having the same issue with volume merging on 18.09.7...
Thansk for your help

[thaJeztah]

@LaurentTrk feel free to open a new issue with steps to reproduce if it's not fixed (or if there's a regression)

[LaurentTrk]

Thanks @thaJeztah , here it is : #1981

[thaJeztah]

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 🤗