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

[19.03 backport] daemon: Use short libnetwork ID in exec-root & update libnetwork #424

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 15, 2019

backport of:

Relates to / addresses: moby#39608 Upgrade to 19.03 from 18 results in libnetwork-setkey hitting UNIX_PATH_MAX limit

@thaJeztah thaJeztah added this to the 19.03.6 milestone Nov 15, 2019
@thaJeztah
Copy link
Member Author

marked as WIP because this vendors from my fork, pending moby/libnetwork#2482 to be merged

also updates libnetwork to d9a6682a4dbb13b1f0d8216c425fe9ae010a0f23
full diff:

moby/libnetwork@3eb3938...d9a6682

- moby/libnetwork#2482 [19.03 backport] Shorten controller ID in exec-root to not hit UNIX_PATH_MAX
- moby/libnetwork#2483 [19.03 backport] Fix panic in drivers/overlay/encryption.go

Signed-off-by: Grant Millar <rid@cylo.io>
(cherry picked from commit df7b8f4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_39608_short_libnetwork_id branch from d7d05ba to d3d724e Compare November 21, 2019 13:33
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] daemon: Use short libnetwork ID in exec-root & update libnetwork [19.03 backport] daemon: Use short libnetwork ID in exec-root & update libnetwork Nov 21, 2019
@thaJeztah
Copy link
Member Author

libnetwork PRs were merged, so removed "WIP"

Copy link

@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

@cpuguy83
Copy link

Is this a known flake?

[2019-11-21T13:44:57.149Z] === FAIL: pkg/plugins TestClientWithRequestTimeout (0.00s)

[2019-11-21T13:44:57.149Z]     client_test.go:254: assertion failed: expected an error, got nil: expected error

@thaJeztah
Copy link
Member Author

hm; not sure actually if it's a known one

@Rid
Copy link

Rid commented Jan 13, 2020

@thaJeztah just checking if this can be merged? Thanks!

@thaJeztah
Copy link
Member Author

merging this if it goes green

@arkodg can you do a follow up with the latest of the 19.03 branch from libnetwork?

@thaJeztah thaJeztah merged commit 9077436 into docker-archive:19.03 Jan 16, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_39608_short_libnetwork_id branch January 16, 2020 21:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants