Skip to content

WIP: bump moby/client and moby/api#6893

Draft
thaJeztah wants to merge 4 commits intodocker:masterfrom
thaJeztah:bump_moby
Draft

WIP: bump moby/client and moby/api#6893
thaJeztah wants to merge 4 commits intodocker:masterfrom
thaJeztah:bump_moby

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

- What I did

- How I did it

- How to verify it

- Human readable description for the release notes

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@thaJeztah
Copy link
Copy Markdown
Member Author

Some failures may be legit; need to check if the tests were wrong (and something fixed) or if we have a regression

cc @vvoland FYI

#18 68.04 === FAIL: cli/compose/loader TestLoadWithInterpolationCastFull (0.01s)
#18 68.04     loader_test.go:761: assertion failed: 
#18 68.04         --- expected
#18 68.04         +++ config
#18 68.04           &types.Config{
#18 68.04           	Filename: "filename.yml",
#18 68.04           	Version:  "3.8",
#18 68.04           	Services: types.Services{
#18 68.04           		{
#18 68.04           			... // 33 identical fields
#18 68.04           			Networks: nil,
#18 68.04           			Pid:      "",
#18 68.04           			Ports: []types.ServicePortConfig{
#18 68.04         - 				{Mode: "ingress", Target: 555, Protocol: "tcp"},
#18 68.04         - 				{Mode: "ingress", Target: 34567, Protocol: "tcp"},
#18 68.04           				{Target: 555, Published: 555},
#18 68.04           			},
#18 68.04           			Privileged: true,
#18 68.04           			ReadOnly:   true,
#18 68.04           			... // 17 identical fields
#18 68.04           		},
#18 68.04           	},
#18 68.04           	Networks: {"front": {Name: "front", External: {External: true}, Internal: true, Attachable: true, ...}},
#18 68.04           	Volumes:  {"data": {Name: "data", External: {External: true}}},
#18 68.04           	... // 3 identical fields
#18 68.04           }
#18 68.04         

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

Still some remaining failures; need to look at these; from what I can see, it's to allow a port-mapping without host-port specified (--port 80) and to implicitly use that as --port 0:80 ?

#18 68.06 === Failed
#18 68.06 === FAIL: cli/command/service TestUpdatePorts (0.00s)
#18 68.06     update_test.go:282: assertion failed: expected [{ udp %!s(uint32=333) %!s(uint32=0) } {  %!s(uint32=555) %!s(uint32=0) } { tcp %!s(uint32=1000) %!s(uint32=1000) ingress}] (length 3) to have length 2
#18 68.06
#18 68.06 === FAIL: cli/command/service TestUpdatePortsRmWithProtocol (0.00s)
#18 68.06     update_test.go:499: assertion failed: expected [{ tcp %!s(uint32=80) %!s(uint32=8080) ingress} { tcp %!s(uint32=81) %!s(uint32=8081) ingress} { tcp %!s(uint32=82) %!s(uint32=8082) ingress}] (length 3) to have length 2
#18 68.06
#18 68.06 === FAIL: cli/compose/loader TestFullExample (0.02s)
#18 68.06     loader_test.go:982: assertion failed: error is not nil: decoding failed due to the following error(s):
#18 68.06
#18 68.06         'Ports' invalid ranges specified for container and host Ports: 3001-3005 and 0
#18 68.06
#18 68.06 === FAIL: opts/swarmopts TestPortOptValidSimpleSyntax/80 (0.00s)
#18 68.06     port_test.go:147: assertion failed: expected [] (length 0) to have length 1
#18 68.06     port_test.go:149: expected [] to contain { tcp 80 0 ingress}, did not
#18 68.06
68.06 === FAIL: opts/swarmopts TestPortOptValidSimpleSyntax/80 (0.00s)
68.06     port_test.go:147: assertion failed: expected [] (length 0) to have length 1
68.06     port_test.go:149: expected [] to contain { tcp 80 0 ingress}, did not
68.06 
68.06 === FAIL: opts/swarmopts TestPortOptValidSimpleSyntax (0.00s

return func(yield func(Port) bool) {
if pr.proto == protoZero {
return
}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the culprit; the zero value means "map to ephemeral port" so should not be discarded

This reverts commit ae9e27b.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants