3 Commits

Author	SHA1	Message	Date
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
Vincent Demeester	8417e49792	Add support for kubernetes in docker cli ... - Add support for kubernetes for docker stack command - Update to go 1.9 - Add kubernetes to vendors - Print orchestrator in docker version command Signed-off-by: Vincent Demeester <vincent@sbr.pm> Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>	2017-12-26 11:22:32 +01:00