4 Commits

Author	SHA1	Message	Date
Nick Adcock	4006c42e13	Added transforms for compose overrides ... Added transforms for when merging compose overrides to preserve the functionality that was broken by bumping mergo to v1.3.8 This includes: - Special transform for ulimits so single overrides both soft/hard and the reverse - Special transform for service network configs so the override replaces all aliases Signed-off-by: Nick Adcock <nick.adcock@docker.com>	2020-01-24 15:52:36 +00:00
Sebastiaan van Stijn	96ec7299d8	cli/compose/loader: Using a reference for the variable on range scope `overrideService` (scopelint) ... ``` cli/compose/loader/merge.go:64:41: Using a reference for the variable on range scope `overrideService` (scopelint) if err := mergo.Merge(&baseService, &overrideService, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithTransformers(specials)); err != nil { ^ cli/compose/loader/loader_test.go:1587:28: Using the variable on range scope `testcase` in function literal (scopelint) config, err := loadYAML(testcase.yaml) ^ cli/compose/loader/loader_test.go:1590:58: Using the variable on range scope `testcase` in function literal (scopelint) assert.Check(t, is.DeepEqual(config.Services[0].Init, testcase.init)) ^ ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2019-10-31 19:22:34 +01:00
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
Vincent Demeester	1872bd802c	Add support for multiple composefile when deploying ... Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2018-01-29 17:27:25 -08:00