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

[17.09] Restore error type in FindNetwork#331

Merged
andrewhsu merged 1 commit intodocker-archive:17.09from
thaJeztah:17.09-backport-fix-net-not-found
Nov 30, 2017
Merged

[17.09] Restore error type in FindNetwork#331
andrewhsu merged 1 commit intodocker-archive:17.09from
thaJeztah:17.09-backport-fix-net-not-found

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Cherry-pick of moby/moby#35634 (moby/moby@51cea0a) for 17.09

git checkout -b 17.09-backport-fix-net-not-found upstream/17.09

git cherry-pick -s -S -x -Xsubtree=components/engine 51cea0a53c2fd36832277402e9faac81bfb4abd4

Conflicts in:

both modified:   components/engine/daemon/daemon_test.go
both modified:   components/engine/daemon/network.go

Due to moby/moby@e52001c not being included in 17.09

I fixed the conflicts in components/engine/daemon/network.go by moving the error fix from FindNetwork() to GetNetworkByID()

The error type libnetwork.ErrNoSuchNetwork is used in the controller
to retry the network creation as a managed network though the manager.
The change of the type was breaking the logic causing the network to
not being created anymore so that no new container on that network
was able to be launched
Added unit test

Signed-off-by: Flavio Crisciani flavio.crisciani@docker.com

The error type libnetwork.ErrNoSuchNetwork is used in the controller
to retry the network creation as a managed network though the manager.
The change of the type was breaking the logic causing the network to
not being created anymore so that no new container on that network
was able to be launched
Added unit test

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 51cea0a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @fcrisciani @cpuguy83 PTAL if it looks good; also if we need to include moby/moby@e52001c or not

@andrewhsu andrewhsu added this to the 17.09.1 milestone Nov 30, 2017
@fcrisciani
Copy link
Copy Markdown

LGTM

@andrewhsu andrewhsu merged commit c245895 into docker-archive:17.09 Nov 30, 2017
@thaJeztah thaJeztah deleted the 17.09-backport-fix-net-not-found branch December 1, 2017 15:04
docker-jenkins pushed a commit that referenced this pull request Aug 22, 2019
[19.03 backport] Cherry-picking build fixes
Upstream-commit: ed20165a37b40ff1cfbe55e218344c5e89f30ee2
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…ix-net-not-found

[17.09] Restore error type in FindNetwork
docker-jenkins pushed a commit that referenced this pull request Jul 21, 2020
docker-ce-cli lacks dependency to groupadd
Upstream-commit: c3ff588
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
docker-ce-cli lacks dependency to groupadd
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.

3 participants