5 Commits

Author	SHA1	Message	Date
Vincent Demeester	f66bd50c2b	Merge pull request #28696 from jlhawn/deprecate_graph_flag ... Deprecate --graph flag; Replace with --data-root Upstream-commit: 1ecaed0a99331ff6140e0a714e1b50d466597775 Component: engine	2017-03-31 10:51:15 +02:00
Sebastiaan van Stijn	719f2c6960	Add conflict check for flags, and update deprecation versions ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: df7a72cffa7f28c67fb25eecd113dc21822afcc0 Component: engine	2017-03-30 12:21:05 +02:00
Sebastiaan van Stijn	dcff175aff	Remove constant for "config-file" flag ... None of the daemon flags use a constant for the flag name. This patch removes the constant for consistency Also removes a FIXME, that was now in the wrong location, and added a long time ago in 353b7c8ec77b30fa83dac5ec0778193f6de8b437, without a lot of context (and probably no longer really relevant). Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9894576fb7e11d9536e09ca04193b845a33b9dec Component: engine	2017-03-30 12:01:00 +02:00
Josh Hawn	fd940e1e8e	Deprecate --graph flag; Replace with --data-root ... Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Upstream-commit: 261ef1fa27c4dfefa5f686b0a4ef354a43040e58 Component: engine	2017-03-30 11:24:56 +02:00
Vincent Demeester	dd8010e320	Extract daemon configuration and discovery to their own package ... This also moves some cli specific in `cmd/dockerd` as it does not really belong to the `daemon/config` package. Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: db63f9370e26d725357c703cbaf9ab63cc7b6d0a Component: engine	2017-02-08 09:53:38 +01:00