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.

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

[20.10 backport] builder-next: relax second cache key requirements for schema1 #42382

Merged
merged 1 commit into from
May 20, 2021
Merged

[20.10 backport] builder-next: relax second cache key requirements for schema1 #42382

merged 1 commit into from
May 20, 2021

Conversation

thaJeztah
Copy link
Member

backport of #42371
fixes moby/buildkit#2033

Schema1 images can not have a config based cache key
before the layers are pulled. Avoid validation and reuse
manifest digest as a second key.

- Description for the changelog

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

@tonistiigi @thaJeztah
builder-next: relax second cache key requirements for schema1
94c1890 
Schema1 images can not have a config based cache key
before the layers are pulled. Avoid validation and reuse
manifest digest as a second key.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 85167fc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 20.10.7 milestone May 17, 2021
@thaJeztah
Copy link
Member Author

@cpuguy83 @tonistiigi @AkihiroSuda PTAL

@thaJeztah
Copy link
Member Author

Failure is a known flaky; #42357

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

cpuguy83
cpuguy83 approved these changes May 20, 2021
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit 3db8385 into moby:20.10 May 20, 2021
@thaJeztah thaJeztah deleted the 20.10_backport_schema1_cache_fix branch May 20, 2021 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees
No one assigned
Labels
area/builder/buildkit Issues affecting buildkit area/builder kind/bugfix PR's that fix bugs status/2-code-review
Projects
None yet
Milestone
20.10.7
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thaJeztah @tonistiigi @cpuguy83