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.11] cherry-picks for v0.11.1 #1926

Merged
merged 10 commits into from Jul 5, 2023
Merged

Conversation

crazy-max and others added 4 commits July 3, 2023 11:53
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 7a54721)
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit 1e576dd)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 120f3a8)
Signed-off-by: Jhan S. Álvarez <alvarezpcuser@gmail.com>
(cherry picked from commit e65f6b8)
@jedevc jedevc added this to the v0.11.1 milestone Jul 3, 2023
@jedevc
Copy link
Collaborator Author

jedevc commented Jul 3, 2023

Hm, it looks like TestBuildDetailsLink fails for the docker driver unless 7147463 is cherry-picked as well? I think this is because older docker doesn't support the history API?

@crazy-max should we cherry-pick the docker update as well, or modify the test to skip on older docker versions?

=== CONT  TestIntegration/TestBuildDetailsLink/worker=docker
    build.go:175: 
        	Error Trace:	/src/tests/build.go:175
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:89
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:198
        	Error:      	Should be true
        	Test:       	TestIntegration/TestBuildDetailsLink/worker=docker
        	Messages:   	expected build details link in output, got "#0 building with \"integration-ygyi242g33wfsyt93p1xhptp8\" instance using docker driver\n\n#1 [internal] load .dockerignore\n#1 transferring context: 2B done\n#1 DONE 0.0s\n\n#2 [internal] load build definition from Dockerfile\n#2 transferring dockerfile: 76B done\n#2 DONE 0.0s\n\n#3 [internal] load metadata for docker.io/library/busybox:latest\n#3 DONE 0.0s\n\n#4 [1/2] FROM docker.io/library/busybox:latest@sha256:0d5a701f0ca53f38723108687add000e1922f812d4187dea7feaee85d2f5a6c5\n#4 DONE 0.0s\n\n#5 [2/2] RUN echo foo > /bar\n#5 CACHED\n"

@crazy-max
Copy link
Member

@crazy-max should we cherry-pick the docker update as well, or modify the test to skip on older docker versions?

I think it's fine to cherry pick 7147463, it's only used for tests.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 7147463)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit d45601f)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 20d2501)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit cbc4733)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 87b9f9e)
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 8cbb7a9)
@jedevc jedevc marked this pull request as ready for review July 5, 2023 12:45
@jedevc jedevc merged commit 1602b49 into docker:v0.11 Jul 5, 2023
60 checks passed
@jedevc jedevc deleted the v0.11-cherry-picks branch July 5, 2023 12:54
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.

None yet

4 participants