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

[18.03] Fix to address regression caused by PR 30897#452

Merged
andrewhsu merged 1 commit intodocker-archive:18.03from
thaJeztah:18.03-backport-selansen-36247
Mar 6, 2018
Merged

[18.03] Fix to address regression caused by PR 30897#452
andrewhsu merged 1 commit intodocker-archive:18.03from
thaJeztah:18.03-backport-selansen-36247

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Cherry-pick of moby/moby#36316 for 18.03, to address moby/moby#36247 (a regression introduced in moby/moby#36316)

git checkout -b 18.03-backport-selansen-36247 upstream/18.03
git cherry-pick -s -S -x -Xsubtree=components/engine 7cf8b20762cc9491f52ff3f3d94c880378183696

No conflicts

With the inclusion of PR 30897, creating service for host network
fails in 18.02. Modified IsPreDefinedNetwork check and return
NetworkNameError instead of errdefs.Forbidden to address this issue

    With the inclusion of PR 30897, creating service for host network
    fails in 18.02. Modified IsPreDefinedNetwork check and return
    NetworkNameError instead of errdefs.Forbidden to address this issue

Signed-off-by: selansen <elango.siva@docker.com>
(cherry picked from commit 7cf8b20)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.03.0 milestone Mar 6, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @cpuguy83 @vdemeester @selansen PTAL

Copy link
Copy Markdown
Contributor

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🦁

@selansen
Copy link
Copy Markdown
Contributor

selansen commented Mar 6, 2018

LGTM

@andrewhsu andrewhsu merged commit 5ba2b1a into docker-archive:18.03 Mar 6, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-selansen-36247 branch March 6, 2018 18:12
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
[19.03] Bump Golang 1.12.15
Upstream-commit: e6ba13d3b9d0b48ac25db9d2bb7e432bff239c9e
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
…elansen-36247

[18.03] Fix to address regression caused by PR 30897
docker-jenkins pushed a commit that referenced this pull request Apr 11, 2020
Add Fedora 32, remove Fedora 29
Upstream-commit: 61b1032
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
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