Skip to content

Conversation

@thaJeztah
Copy link
Member

backport of #2443 for the 19.03 branch

relates to moby/moby#39822
relates to / addresses moby/moby#39608

Signed-off-by: Grant Millar <[email protected]>
(cherry picked from commit bdeccb5)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Copy link
Contributor

@selansen selansen 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 selansen merged commit d9a6682 into moby:bump_19.03 Nov 20, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_short_key_id branch November 21, 2019 10:31
thaJeztah pushed a commit to thaJeztah/docker that referenced this pull request Nov 21, 2019
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 <[email protected]>
(cherry picked from commit df7b8f4)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 17, 2020
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 <[email protected]>
(cherry picked from commit df7b8f458aec29400c76b8dc87b3ce087d3fa76c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: d3d724e45aa24448990364ad54958f35b6efdf7c
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants