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

[17.12] Fixing ingress network when upgrading from 17.09 to 17.12.#389

Merged
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-upgrade_fix
Feb 13, 2018
Merged

[17.12] Fixing ingress network when upgrading from 17.09 to 17.12.#389
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-upgrade_fix

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of moby/moby#36003 for 17.12 (fixes moby/moby#35941)

git checkout -b 17.12-backport-upgrade_fix upstream/17.12
git cherry-pick -s -S -x -Xsubtree=components/engine 2d7a50e5855ad0571e76d29cd1ab9f8f3a48433b
git push --set-upstream origin 17.12-backport-upgrade_fix

(cherry picked from commit 2d7a50e)

no conflicts

Signed-off-by: Pradip Dhara <pradipd@microsoft.com>

Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
(cherry picked from commit 2d7a50e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 17.12.1 milestone Jan 19, 2018
Copy link
Copy Markdown
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM but seems to be some timeouts in tests.

cpuguy83 pushed a commit to cpuguy83/docker-ce that referenced this pull request Feb 7, 2018
Add zsh completion for `docker service scale --detach=false`
Upstream-commit: dabfec6dde3fb1aaf7613702ed4117e2af6d06a9
Component: cli
@andrewhsu andrewhsu merged commit d852c51 into docker-archive:17.12 Feb 13, 2018
@thaJeztah thaJeztah deleted the 17.12-backport-upgrade_fix branch February 13, 2018 07:38
docker-jenkins pushed a commit that referenced this pull request Sep 28, 2019
[18.09] Bump golang to 1.12.10 (CVE-2019-16276)
Upstream-commit: 5e9dffba12ead3c5e40f2c3aee36c908d99c83d7
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 30, 2019
…rksuite

[19.03 backport] integration-cli: fix DockerNetworkSuite not being run
Upstream-commit: 060997ca6be2fb41344237842e66d16ef4cc67e3
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…pgrade_fix

[17.12] Fixing ingress network when upgrading from 17.09 to 17.12.
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.

4 participants