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

[18.06] backport bump containerd daemon to v1.1.2 #33

Merged
merged 1 commit into from
Aug 14, 2018

Conversation

thaJeztah
Copy link
Member

backport of moby#37467 for 18.06;

git checkout -b 18.06-update-containerd ce-engine/18.06
git cherry-pick -s -S -x 9e773a12fb1cc5da7bec13d46fe04673a4593632 
git push -u origin

cherry-pick was clean; no conflicts

Updates cri version to 1.0.4, to add max-container-log-line-size

Updates cri version to 1.0.4, to add `max-container-log-line-size`

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 9e773a1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.06.1 milestone Aug 8, 2018
@thaJeztah
Copy link
Member Author

Copy link

@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 🌮

@thaJeztah
Copy link
Member Author

PowerPC having some connection issues;

09:01:55 E: Failed to fetch http://cdn-fastly.deb.debian.org/debian/pool/main/g/gcc-mingw-w64/g++-mingw-w64-x86-64_6.3.0-18+19.3+b3_ppc64el.deb  503  first byte timeout
09:01:55 E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing

Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 68a4625 into docker-archive:18.06 Aug 14, 2018
@thaJeztah thaJeztah deleted the 18.06-update-containerd branch August 15, 2018 14:03
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