Skip to content

vendor: docker/docker master (v24.0.0-dev), containerd v1.6.20 - #4142

Merged
thaJeztah merged 3 commits into
docker:masterfrom
thaJeztah:update_engine2
Mar 31, 2023
Merged

vendor: docker/docker master (v24.0.0-dev), containerd v1.6.20#4142
thaJeztah merged 3 commits into
docker:masterfrom
thaJeztah:update_engine2

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

vendor: github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b

full diff: opencontainers/image-spec@02efb9a...3a7f492

vendor: github.com/containerd/containerd v1.6.20

full diff: containerd/containerd@v1.6.19...v1.6.20

vendor: github.com/docker/docker 7c93e4a09be1 (v24.0.0-dev)

full diff: moby/moby@54130b5...7c93e4a

- What I did

- How I did it

- How to verify it

- Description for the changelog

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

…240-3a7f492d3f1b
full diff: opencontainers/image-spec@02efb9a...3a7f492
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: containerd/containerd@v1.6.19...v1.6.20
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: moby/moby@54130b5...7c93e4a
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Merging #4142 (05cffcb) into master (de0d30f) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files
@@ Coverage Diff @@## master #4142 +/- ##
=======================================
Coverage 59.10% 59.10% =======================================
Files 287 287 Lines 24742 24742 =======================================
Hits 14624 14624 Misses 9234 9234 Partials 884 884 

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Yup, I think there's some regression somewhere (I suspect from #4129)

/cc @crazy-max

=== FAIL: e2e/cli-plugins TestGlobalHelp/bare (0.25s)
help_test.go:67: assertion failed: --- ←
+++ output
@@ -15,4 +15,5 @@
logout Log out from a registry
search Search Docker Hub for images
+ version Show the Docker version information
info Display system-wide information
@@ -31,4 +32,5 @@
system Manage Docker
trust Manage trust on Docker images
+ volume Manage volumes
Swarm Commands:
@@ -66,4 +68,5 @@
tag Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
top Display the running processes of a container
+ unpause Unpause all processes within one or more containers
update Update configuration of one or more containers
wait Block until one or more containers stop, then print their exit codes

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Thanks! Let me bring this one in 👍

@thaJeztah
thaJeztah merged commit 33961a7 into docker:masterMar 31, 2023
@thaJeztah
thaJeztah deleted the update_engine2 branch March 31, 2023 20:49
Sign up for freeto 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.

3 participants

@thaJeztah@codecov-commenter@corhere