Vincent Demeester 0122730faf Fix error with merge composefile with networks… ...

… 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>

2018-04-05 10:37:35 +02:00

..

example1.env

Import docker/docker/cli

2017-04-17 17:40:59 -04:00

example2.env

Import docker/docker/cli

2017-04-17 17:40:59 -04:00

full-example.yml

Share the compose loading code between swarm and k8s stack deploy

2018-02-14 14:07:48 +01:00

full-struct_test.go

Fixes some unit tests to be able to run them on windows

2018-03-07 18:18:13 +01:00

interpolate.go

Fix load order

2017-10-05 12:03:29 -04:00

loader_test.go

Fix named network in compose file

2018-03-12 15:15:27 -04:00

loader.go

Merge pull request #824 from ethan-haynes/820-bind-mount-source-missing-error

2018-02-21 13:33:24 -05:00

merge_test.go

Fix error with merge composefile with networks…

2018-04-05 10:37:35 +02:00

merge.go

Fix error with merge composefile with networks…

2018-04-05 10:37:35 +02:00

types_test.go

Fixes some unit tests to be able to run them on windows

2018-03-07 18:18:13 +01:00

volume_test.go

Convert assert.Check(t, is.Error()) to assert.Error

2018-03-06 16:00:28 -05:00

volume.go

Support parsing of named pipes for compose volumes.

2017-09-26 11:24:23 -04:00