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

Remove redundant 'if' statement

Browse source 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
This commit is contained in:
Yanqiang Miao 2016-11-16 15:31:42 +08:00 • committed by Victor Vieux
parent 3b93497fdb
commit 0d815d9bb7
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/commit.go
View file

@ -17,7 +17,6 @@ import (
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/reference" "github.com/docker/docker/reference"
"github.com/docker/go-connections/nat"
) )
// merge merges two Config, the image container configuration (defaults values), // merge merges two Config, the image container configuration (defaults values),
@ -32,9 +31,6 @@ func merge(userConf, imageConf *containertypes.Config) error {
if len(userConf.ExposedPorts) == 0 { if len(userConf.ExposedPorts) == 0 {
userConf.ExposedPorts = imageConf.ExposedPorts userConf.ExposedPorts = imageConf.ExposedPorts
} else if imageConf.ExposedPorts != nil { } else if imageConf.ExposedPorts != nil {
if userConf.ExposedPorts == nil {
userConf.ExposedPorts = make(nat.PortSet)
}
for port := range imageConf.ExposedPorts { for port := range imageConf.ExposedPorts {
if _, exists := userConf.ExposedPorts[port]; !exists { if _, exists := userConf.ExposedPorts[port]; !exists {
userConf.ExposedPorts[port] = struct{}{} userConf.ExposedPorts[port] = struct{}{}