Skip to content

Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275#30548

Merged
LK4D4 merged 2 commits intomoby:masterfrom
yongtang:vendor-swarmkit
Jan 30, 2017
Merged

Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275#30548
LK4D4 merged 2 commits intomoby:masterfrom
yongtang:vendor-swarmkit

Conversation

@yongtang
Copy link
Member

@yongtang yongtang commented Jan 29, 2017

This fix updates SwarmKit to 78ae345
(from 037b491)

In addition to improvements in SwarmKit, the following issues are related to Docker:

This fix fixes #30199

Signed-off-by: Yong Tang [email protected]

NOTE: There is a change in TestSwarmNetworkPlugin (Ref #30332)

This fix updates SwarmKit to 78ae345
(from 037b491)

The following issues in docker are related
- Can not update service in host publish mode (moby#30199) (fixed)
- Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (moby#29972) (needed)
- Explicitly disallow network pluginv1 creation in swarm mode
  (See discussion in moby/swarmkit/pull/1899, moby/swarmkit/pull/1894,
  and moby/pull/30332#issuecomment-274277948)

This fix fixes moby#30199

Signed-off-by: Yong Tang <[email protected]>
This commit updates TestSwarmNetworkPlugin, similiar to
changes in moby#30332

Signed-off-by: Yong Tang <[email protected]>
@yongtang
Copy link
Member Author

/cc @anusha-ragunathan @mavenugo for changes in TestSwarmNetworkPlugin (Ref #30332)

@yongtang
Copy link
Member Author

/cc @aaronlehmann @LK4D4

@aaronlehmann
Copy link

LGTM

Note that the fix for #30199 is targeted for 1.13.1. To be included on the 1.13 branch, it will need to be applied to the bump_v1.13.1 branch of swarmkit, and that branch will need to be vendored on the 1.13.x branch of docker. Unfortunately, it looks like the fix doesn't apply cleanly to the 1.13 branch. @yongtang, could you please backport it and open a PR in swarmkit?

@LK4D4
Copy link
Contributor

LK4D4 commented Jan 30, 2017

LGTM

@LK4D4 LK4D4 merged commit 61198b5 into moby:master Jan 30, 2017
@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Jan 30, 2017
@thaJeztah
Copy link
Member

Let me reopen #30199 so that we don't think it's already fixed for 1.13.1

@anusha-ragunathan
Copy link
Contributor

For posterity, TestSwarmNetworkPlugin and related swarmkit vendoring changes LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Important] can not update service publish port(host mode) in docker 1.13.0-rc5

7 participants