Upgrade moby/moby dependencies to reflect StopOptions change (carry 3083) #3103
Conversation
Update to the latest v23.0.0-dev full diff: moby/moby@7ea283f...v23.0.0-beta.1 rewrite TestAllocateWithInvalidSubnet as it was no longer valid This test was added in d5f9e7f (renamed in b2ad71f). At the time, docker did not support /32 subnets, but starting with moby/moby@3a938df, docker added support for /31 and /32 subnets, rendering this tests invalid. Signed-off-by: Martin Braun <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
| @@ -432,7 +432,8 @@ func (c *containerConfig) volumeCreateRequest(mount *api.Mount) *volume.VolumeCr | |||
| labels = mount.VolumeOptions.Labels | |||
| } | |||
|
|
|||
| return &volume.VolumeCreateBody{ | |||
| // FIXME: do we need the ClusterVolumeSpec here? | |||
There was a problem hiding this comment.
Ugh, it looks like we should pass ClusterVolumeSpec for API >=1.42
20.10.3 seems to be API 1.41, so of we upgrade to 23.0 (API >=1.42) we probably need this?
There was a problem hiding this comment.
I'm not familiar with this code though 🙈
There was a problem hiding this comment.
Yeah, it’s a new feature, and at this time “not yet supported” on the executor implementation in SwarmKit itself.
The implementation in docker lives in https://github.com/moby/moby/blob/v23.0.0-beta.1/daemon/cluster/executor/container/controller.go
So yes, it should be added at some point (perhaps I should create a tracking ticket for it) for swarmkit running standalone as well, but first priority for me was to make sure it is at least compatible with the upcoming (v23) release.
There was a problem hiding this comment.
Ah, thanks for the explanation!
|
Let me bring this one in, and do a vendor update in docker/docker |
thaJeztah
deleted the
carry_3083_implement_stopoptions_for_container_restart
branch
Update to the latest v23.0.0-dev
full diff: moby/moby@7ea283f...v23.0.0-beta.1
rewrite TestAllocateWithInvalidSubnet as it was no longer valid
This test was added in d5f9e7f / #62 (renamed in b2ad71f / #93). At the time, docker did not support /32 subnets, but starting with
moby/moby@3a938df / moby/moby#42626, docker added support for /31 and /32 subnets, rendering this tests invalid.
- How to test it
- Description for the changelog