From a0eec14c7da5b213302c2675801aaf788e84efed Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 19 Jul 2013 02:47:35 +0000 Subject: [PATCH] fix overwrites EXPOSE --- utils.go | 2 +- utils_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils.go b/utils.go index 33cfbe506f..16efccd387 100644 --- a/utils.go +++ b/utils.go @@ -78,7 +78,7 @@ func MergeConfig(userConf, imageConf *Config) { imageNat, _ := parseNat(imagePortSpec) for _, userPortSpec := range userConf.PortSpecs { userNat, _ := parseNat(userPortSpec) - if imageNat.Proto == userNat.Proto && imageNat.Frontend == userNat.Frontend { + if imageNat.Proto == userNat.Proto && imageNat.Backend == userNat.Backend { found = true } } diff --git a/utils_test.go b/utils_test.go index 1bd18f4af0..5ea3682bac 100644 --- a/utils_test.go +++ b/utils_test.go @@ -148,7 +148,7 @@ func TestMergeConfig(t *testing.T) { volumesUser["/test3"] = struct{}{} configUser := &Config{ Dns: []string{"3.3.3.3"}, - PortSpecs: []string{"2222:3333", "3333:3333"}, + PortSpecs: []string{"3333:2222", "3333:3333"}, Env: []string{"VAR2=3", "VAR3=3"}, Volumes: volumesUser, } @@ -165,11 +165,11 @@ func TestMergeConfig(t *testing.T) { } if len(configUser.PortSpecs) != 3 { - t.Fatalf("Expected 3 portSpecs, 1111:1111, 2222:3333 and 3333:3333, found %d", len(configUser.PortSpecs)) + t.Fatalf("Expected 3 portSpecs, 1111:1111, 3333:2222 and 3333:3333, found %d", len(configUser.PortSpecs)) } for _, portSpecs := range configUser.PortSpecs { - if portSpecs != "1111:1111" && portSpecs != "2222:3333" && portSpecs != "3333:3333" { - t.Fatalf("Expected 1111:1111 or 2222:3333 or 3333:3333, found %s", portSpecs) + if portSpecs != "1111:1111" && portSpecs != "3333:2222" && portSpecs != "3333:3333" { + t.Fatalf("Expected 1111:1111 or 3333:2222 or 3333:3333, found %s", portSpecs) } } if len(configUser.Env) != 3 {