Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.07] Re-vendor swarmkit #136

Merged
vieux merged 1 commit into
docker-archive:17.07from
cyli:re-vendor-swarmkit-17.07
Jul 25, 2017
Merged

[17.07] Re-vendor swarmkit #136
vieux merged 1 commit into
docker-archive:17.07from
cyli:re-vendor-swarmkit-17.07

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented Jul 25, 2017

This vendoring comes from the swarmkit bump_17.07 branch, and includes the following fixes:

cc @aaronlehmann

- moby/swarmkit#2288 (Allow updates of failed services with restart policy "none")
- moby/swarmkit#2304 (Reset restart history when task spec changes)
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)

Signed-off-by: Ying <ying.li@docker.com>
@aaronlehmann
Copy link
Copy Markdown

Tests are failing, but I don't think it's related to the changes here. It seems to be because this repo runs the integration tests with a newer version of the CLI. There's been at least one PR in moby/moby that updates tests to be compatible with a current version of the CLI, but it was refused (moby/moby#33386).

@andrewhsu andrewhsu added this to the 17.07.0 milestone Jul 25, 2017
@seemethere
Copy link
Copy Markdown
Contributor

seemethere commented Jul 25, 2017

Test Failures:

1. FAIL: docker_cli_rmi_test.go:227: DockerSuite.TestRmiContainerImageNotFound
2. FAIL: docker_cli_rmi_test.go:144: DockerSuite.TestRmiImageIDForceWithRunningContainersAndMultipleTags
3. FAIL: docker_cli_run_unix_test.go:207: DockerSuite.TestRunAttachDetachFromInvalidFlag
4. FAIL: docker_cli_run_unix_test.go:1558: DockerSuite.TestRunWithNanoCPUs
5. FAIL: docker_cli_update_unix_test.go:286: DockerSuite.TestUpdateWithNanoCPUs
6. FAIL: docker_cli_service_logs_test.go:24: DockerSwarmSuite.TestServiceLogs
7. FAIL: docker_cli_swarm_unix_test.go:56: DockerSwarmSuite.TestSwarmNetworkPluginV2
8. FAIL: docker_cli_swarm_test.go:1695: DockerSwarmSuite.TestSwarmServicePsMultipleServiceIDs

Test failures seem consistent to what we're seeing with docker-integration-tests job and do not seem to be related to this specific PR.

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Jul 25, 2017

LGTM

@vieux vieux merged commit 1c65e20 into docker-archive:17.07 Jul 25, 2017
@cyli cyli deleted the re-vendor-swarmkit-17.07 branch July 25, 2017 23:07
@cyli cyli mentioned this pull request Jul 25, 2017
docker-jenkins pushed a commit that referenced this pull request Aug 8, 2018
Merged with https://github.com/seemethere/unir
Upstream-commit: 7dcf805d9f7b1f633a371ee46b24b86cd7bceca9
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Dec 13, 2018
[18.09 engine] registry: use len(via)!=0 instead of via!=nil
Upstream-commit: 01c732d40a3f67bed801f8fd4b62f3dbc035b788
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants