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

[19.03 backport] vendor: containerd to 7c1e88399 #339

Merged
merged 1 commit into from
Sep 12, 2019
Merged

[19.03 backport] vendor: containerd to 7c1e88399 #339

merged 1 commit into from
Sep 12, 2019

Conversation

thaJeztah
Copy link
Member

backport of moby#39435

Fixes moby/buildkit#1062
when DOCKER_BUILDKIT=1

@thaJeztah thaJeztah added this to the 19.03.2 milestone Aug 28, 2019
@thaJeztah
Copy link
Member Author

ping @tiborvass @tonistiigi PTAL

@thaJeztah thaJeztah mentioned this pull request Aug 28, 2019
Merged
@thaJeztah thaJeztah modified the milestones: 19.03.2, 19.03.3 Aug 30, 2019
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_containerd_optional_docker_content_digest branch from 587e51a to e28ce2c Compare September 6, 2019 21:10
@thaJeztah
vendor: containerd to 7c1e88399
f1a639b 
Fixes moby/buildkit#1062
when DOCKER_BUILDKIT=1

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 14bd416)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_containerd_optional_docker_content_digest branch from e28ce2c to f1a639b Compare September 12, 2019 08:12
@thaJeztah
Copy link
Member Author

rebased to get the CI fix from #350 in

@thaJeztah
Copy link
Member Author

all green; merging

@thaJeztah thaJeztah merged commit 0b12b76 into docker-archive:19.03 Sep 12, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_containerd_optional_docker_content_digest branch September 12, 2019 10:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tiborvass tiborvass tiborvass approved these changes

Assignees
No one assigned
Labels
impact/changelog
Projects
None yet
Milestone
19.03.3
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @tiborvass @andrewhsu