docker-cli

Files

Lei Jitang ba3d7fd0c4 Fix configuration reloading

There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts'
and 'cluster-advertise' that can be reconfigured, configure any of these
options should not affect other options which may have configured in flags.
But this is not true, for example, I start a daemon with -D to enable the
debugging, and after a while, I want reconfigure the 'label', so I add a file
'/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon
to reconfigure the daemon, it work, but the debugging of the daemon is also diabled.
I don't think this is a expeted behaviour.
This patch also have some minor refactor of reconfiguration of cluster-advertiser.
Enable user to reconfigure cluster-advertiser without cluster-store in config file
since cluster-store could also be already set in flag, and we only want to reconfigure
the cluster-advertiser.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b9366c9609166d41e987608041b5a2079726aa5f
Component: engine

2016-02-24 21:12:14 -05:00

listeners

Move listeners and port allocation outside the server.

2016-02-11 14:42:49 -05:00

client_test.go

Add regression tests for client debug flag.

2016-02-02 16:57:36 -05:00

client.go

handle debug mode for clients

2016-02-01 14:36:40 -05:00

common.go

Verify that the configuration keys in the file are valid.