volker.raschek/dcmerge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix(dockerCompoe): compare srcIP and srcPort of mergeExistingWinPorts()

Browse Source
This commit is contained in:
Markus Pesch
2025-02-21 09:51:53 +01:00
parent 2c91222753
commit f8b4fe9af6
2 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/domain/dockerCompose/config_test.go
View File

@ -1183,6 +1183,43 @@ func TestService_MergeExistingWin(t *testing.T) {
Ports: []string{"80:80"},
},
},
{
serviceDeploymentA: &dockerCompose.Service{
Ports: []string{
"0.0.0.0:15005:5005/tcp",
"0.0.0.0:18080:8080/tcp",
},
},
serviceDeploymentB: &dockerCompose.Service{
Ports: []string{"0.0.0.0:6300:6300/tcp"},
},
expectedService: &dockerCompose.Service{
Ports: []string{
"0.0.0.0:15005:5005/tcp",
"0.0.0.0:18080:8080/tcp",
"0.0.0.0:6300:6300/tcp",
},
},
},
{
serviceDeploymentA: &dockerCompose.Service{
Ports: []string{
"0.0.0.0:15005:5005/tcp",
"0.0.0.0:18080:8080/tcp",
},
},
serviceDeploymentB: &dockerCompose.Service{
Ports: []string{
"15005:15005",
},
},
expectedService: &dockerCompose.Service{
Ports: []string{
"0.0.0.0:15005:5005/tcp",
"0.0.0.0:18080:8080/tcp",
},
},
},
// Secrets
{