Skip to content

[20.10 backport] Use docker media type for plugin layers #42256

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 7, 2021
Merged

[20.10 backport] Use docker media type for plugin layers #42256

merged 1 commit into from
Apr 7, 2021

Conversation

cpuguy83
Copy link
Member

@cpuguy83 cpuguy83 commented Apr 6, 2021 •
edited by thaJeztah
Loading

Cherry-picks #42210 to 20.10
fixes #42191

This was changed as part of a refactor to use containerd dist code. The
problem is the OCI media types are not compatible with older versions of
Docker.

@cpuguy83
Use docker media type for plugin layers
60310e2 
This was changed as part of a refactor to use containerd dist code. The
problem is the OCI media types are not compatible with older versions of
Docker.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit a876ede)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@cpuguy83 cpuguy83 requested review from tonistiigi and thaJeztah April 6, 2021 16:54
@thaJeztah thaJeztah mentioned this pull request Apr 6, 2021
Closed
@thaJeztah thaJeztah changed the title [20.10] Use docker media type for plugin layers [20.10 backport] Use docker media type for plugin layers Apr 6, 2021
@thaJeztah thaJeztah added this to the 20.10.6 milestone Apr 6, 2021
thaJeztah
thaJeztah approved these changes Apr 6, 2021
View reviewed changes
Copy link
Member

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

Looks like this test has become flaky recently;

--- FAIL: TestDaemonHostGatewayIP (5.50s)
    daemon_linux_test.go:161: [d58c26946a29a] failed to start daemon with arguments [--data-root /go/src/github.com/docker/docker/bundles/test-integration/TestDaemonHostGatewayIP/d58c26946a29a/root --exec-root /tmp/dxr/d58c26946a29a --pidfile /go/src/github.com/docker/docker/bundles/test-integration/TestDaemonHostGatewayIP/d58c26946a29a/docker.pid --userland-proxy=true --containerd-namespace d58c26946a29a --containerd-plugins-namespace d58c26946a29ap --containerd /var/run/docker/containerd/containerd.sock --host unix:///tmp/docker-integration/d58c26946a29a.sock --debug --storage-driver overlay2 --host-gateway-ip=6.7.8.9] : [d58c26946a29a] daemon exited during startup: exit status 1

@thaJeztah
Copy link
Member

Failure is unrelated and known to be flaky;

=== RUN   TestDockerSwarmSuite/TestSwarmClusterRotateUnlockKey
    --- FAIL: TestDockerSwarmSuite/TestSwarmClusterRotateUnlockKey (91.38s)
        docker_cli_swarm_test.go:1321: [d45fa6d3c88d9] joining swarm manager [d8326cb5603ed]@0.0.0.0:2477, swarm listen addr 0.0.0.0:2478
        docker_cli_swarm_test.go:1322: [d783f70cf1189] joining swarm manager [d8326cb5603ed]@0.0.0.0:2477, swarm listen addr 0.0.0.0:2479
        docker_cli_swarm_test.go:1386: [d45fa6d3c88d9] got 'swarm does not have a leader'. retrying (attempt 1/5)
        docker_cli_swarm_test.go:1386: [d45fa6d3c88d9] got 'swarm does not have a leader'. retrying (attempt 2/5)
        docker_cli_swarm_test.go:1386: [d45fa6d3c88d9] got 'swarm does not have a leader'. retrying (attempt 3/5)
        docker_cli_swarm_test.go:1386: [d45fa6d3c88d9] got 'swarm does not have a leader'. retrying (attempt 4/5)
        docker_cli_swarm_test.go:1386: [d45fa6d3c88d9] got 'swarm does not have a leader'. retrying (attempt 5/5)
        docker_cli_swarm_test.go:1393: assertion failed: error is not nil: exit status 1: [d45fa6d3c88d9] failed after 5 retries: exit status 1 (Error response from daemon: rpc error: code = Unknown desc = The swarm does not have a leader. It's possible that too few managers are online. Make sure more than half of the managers are online.
            )

@thaJeztah thaJeztah merged commit 419b370 into moby:20.10 Apr 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

Assignees
No one assigned
Labels
area/plugins kind/bugfix PR's that fix bugs status/4-merge
Projects
None yet
Milestone
20.10.6
Development

Successfully merging this pull request may close these issues.
3 participants
@cpuguy83 @thaJeztah @AkihiroSuda