Skip to content

[20.10 backport] vendor: github.com/docker/libnetwork 64b7a4574d1426139437d20e81c0b6d391130ec8 #42413

Merged
thaJeztah merged 2 commits into
moby:20.10from
thaJeztah:20.10_backport_bump_libnetwork
May 27, 2021
Merged

[20.10 backport] vendor: github.com/docker/libnetwork 64b7a4574d1426139437d20e81c0b6d391130ec8 #42413
thaJeztah merged 2 commits into
moby:20.10from
thaJeztah:20.10_backport_bump_libnetwork

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

backport of #42412
supersedes #42322

Update libnetwork to make docker run -p 80:80 functional again on environments
with kernel boot parameter ipv6.disable=1.

full diff: moby/libnetwork@b350742...64b7a45

vendor: github.com/ishidawataru/sctp f2269e66cdee387bd321445d5d300893449805be

full diff: ishidawataru/sctp@6e2cb13...f2269e6

  • support SO_SNDBUF/SO_RCVBUF handling
  • Support Go Modules
  • license clarificaton
  • ci: drop 1.6, 1.7, 1.8 support
  • Add support for SocketConfig
  • support goarch mips64le architecture.
  • fix possible socket leak when bind fails

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah added 2 commits May 25, 2021 11:39
…91130ec8

Update libnetwork to make `docker run -p 80:80` functional again on environments
with kernel boot parameter `ipv6.disable=1`.

full diff: moby/libnetwork@b350742...64b7a45

- fix port forwarding with ipv6.disable=1
    - fixes moby/moby/42288 Docker 20.10.6: all containers stopped and cannot start if ipv6 is disabled on host
    - fixes docker/libnetwork/2629 Network issue with IPv6 following update to version 20.10.6
    - fixesdocker/for-linux/1233 Since 20.10.6 it's not possible to run docker on a machine with disabled IPv6 interfaces
- vendor: github.com/ishidawataru/sctp f2269e66cdee387bd321445d5d300893449805be
- Enforce order of lock acquisitions on network/controller, fixes moby#2632
    - fixes docker/libnetwork/2632 Name resolution stuck due to deadlock between different network struct methods
    - fixes moby/moby/42032 Docker deamon get's stuck, can't serve DNS requests

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit e4109b3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
…449805be

full diff: ishidawataru/sctp@6e2cb13...f2269e6

- support SO_SNDBUF/SO_RCVBUF handling
- Support Go Modules
- license clarificaton
- ci: drop 1.6, 1.7, 1.8 support
- Add support for SocketConfig
- support goarch mips64le architecture.
- fix possible socket leak when bind fails

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 22b9e2a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@mrueg

mrueg commented May 25, 2021

Copy link
Copy Markdown
Contributor

@thaJeztah thaJeztah modified the milestones: 21.xx, 20.10.7 May 25, 2021
@thaJeztah

Copy link
Copy Markdown
Member Author

Ah, yes, picked the wrong one, thanks!

@thaJeztah
thaJeztah marked this pull request as ready for review May 25, 2021 19:37
@thaJeztah
thaJeztah requested a review from tianon as a code owner May 25, 2021 19:37
@thaJeztah

Copy link
Copy Markdown
Member Author

Moved this out of draft, because #42412 was merged

@cpuguy83 @tianon ptal

@thaJeztah
thaJeztah merged commit eab37e5 into moby:20.10 May 27, 2021
@thaJeztah
thaJeztah deleted the 20.10_backport_bump_libnetwork branch May 27, 2021 08:44
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.

4 participants