kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Extract daemon configuration and discovery to their own package

Browse source 
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>
This commit is contained in:
Vincent Demeester 2017-01-23 12:23:07 +01:00
parent 41650df87e
commit db63f9370e
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
32 changed files with 900 additions and 748 deletions
Download patch file Download diff file Expand all files Collapse all files

9
daemon/daemon_unix_test.go
View file

@ -10,6 +10,7 @@ import (
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/volume"
"github.com/docker/docker/volume/drivers"
"github.com/docker/docker/volume/local"
@ -181,8 +182,8 @@ func TestParseSecurityOpt(t *testing.T) {
func TestNetworkOptions(t *testing.T) {
daemon := &Daemon{}
dconfigCorrect := &Config{
CommonConfig: CommonConfig{
dconfigCorrect := &config.Config{
CommonConfig: config.CommonConfig{
ClusterStore: "consul://localhost:8500",
ClusterAdvertise: "192.168.0.1:8000",
},
@ -192,8 +193,8 @@ func TestNetworkOptions(t *testing.T) {
t.Fatalf("Expect networkOptions success, got error: %v", err)
}
dconfigWrong := &Config{
CommonConfig: CommonConfig{
dconfigWrong := &config.Config{
CommonConfig: config.CommonConfig{
ClusterStore: "consul://localhost:8500://test://bbb",
},
}