Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.10] cherry-picks to fix dockerd tests #2777

Merged
merged 14 commits into from
Apr 6, 2022

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Apr 6, 2022

dockerd integration tests fixes are isolated so safe to cherry-pick. It's used for vendoring on moby and doesn't affect the release.

tonistiigi and others added 11 commits April 6, 2022 20:36
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 85accab)

# Conflicts:
#	client/client_test.go
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 62c7e15)

# Conflicts:
#	client/client_test.go
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 3c1b5a8)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit e7e6aff)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit fd3eeb1)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit d2106f9)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 31e5970)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 281d708)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 939039c)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit a48cabf)
…rker

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit f484793)
@crazy-max crazy-max force-pushed the v0.10-dockerd-tests branch from 96eeef0 to 09d7951 Compare April 6, 2022 18:44
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 7d5986a)

# Conflicts:
#	client/client_test.go
#	frontend/dockerfile/dockerfile_buildinfo_test.go
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit a9ebab6)
…rker

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 9a4fe5e)
@crazy-max crazy-max force-pushed the v0.10-dockerd-tests branch from 09d7951 to c5e923e Compare April 6, 2022 18:50
@crazy-max
Copy link
Member Author

@crazy-max crazy-max marked this pull request as ready for review April 6, 2022 19:09
@crazy-max crazy-max requested a review from tonistiigi April 6, 2022 19:09
Copy link
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

All these changes should be contained to tests and not affect the releases.

@tonistiigi tonistiigi merged commit 75ba987 into moby:v0.10 Apr 6, 2022
@crazy-max crazy-max deleted the v0.10-dockerd-tests branch April 6, 2022 21:36
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.

2 participants