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

[0.11] vendor: github.com/docker/docker 0cae31c7dd6e08b96994e22c059c132a70119f7c (v23.0.7-dev) #3503

Merged
merged 22 commits into from
Jul 21, 2023
Merged

[0.11] vendor: github.com/docker/docker 0cae31c7dd6e08b96994e22c059c132a70119f7c (v23.0.7-dev) #3503

merged 22 commits into from
Jul 21, 2023

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 12, 2023 •
edited
Loading

backport of

0.11-specific commits:

[0.11] vendor: github.com/docker/docker v23.0.6

full diff: moby/moby@v23.0.5...v23.0.6

[0.11] vendor: github.com/docker/cli v23.0.6

full diff: docker/cli@v23.0.5...v23.0.6

[0.11] vendor: github.com/docker/docker 0420d2b33c42a9f0708c71a18948e60e1b9e4191 (v23.0.7-dev)

relevant changes:

  • remove name_to_handle_at(2) from filtered syscalls and add it to allow-list
  • client: define a "dummy" hostname to use for local connections
    fixed compatibility with go1.19.11 and go1.20.6

full diff: https://github.com/docker/docke/rcompare/v23.0.6...0cae31c7dd6e08b96994e22c059c132a70119f7c

@thaJeztah
Copy link
Member Author

@tonistiigi @crazy-max ptal

@thaJeztah thaJeztah mentioned this pull request Jul 12, 2023
Closed
@thaJeztah thaJeztah force-pushed the 0.11_backport_engine_23.0_rc2 branch from bb652d9 to c52d1de Compare July 15, 2023 18:29
@thaJeztah thaJeztah changed the title [0.11 backport] vendor: github.com/docker/docker, github.com/docker/cli v23.0.0-rc.2 [0.11] vendor: github.com/docker/docker 0420d2b33c42a9f0708c71a18948e60e1b9e4191 (v23.0.7-dev) Jul 15, 2023
@thaJeztah
Copy link
Member Author

Hm... what's this error?

10 DONE 0.5s
++ az storage blob list --output tsv --prefix blobs --container-name cachecontainer --connection-string 'DefaultEndpointsProtocol=http;AccountName=azblobcacheaccount;AccountKey=YXpibG9iY2FjaGVhY2NvdW50a2V5Cg==;BlobEndpoint=http://azblobcacheaccount.blob.localhost.com:10000;'
++ wc -l
ERROR: The API version 2022-11-02 is not supported by Azurite. Please upgrade Azurite to latest version and retry. If you are using Azurite in Visual Studio, please check you have installed latest Visual Studio patch. Azurite command line parameter "--skipApiVersionCheck" or Visual Studio Code configuration "Skip Api Version Check" can skip this error. 
RequestId:dc02aa3d-403a-4652-b317-f6f1365ee9a1
Time:2023-07-15T18:43:25.703Z
ErrorCode:InvalidHeaderValue
+ blobCount=0

thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jul 15, 2023
@thaJeztah
vendor: github.com/moby/buildkit v0.11.7-dev
531f7e5 
temporarily using my branch from moby/buildkit#3503

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah mentioned this pull request Jul 15, 2023
Merged
@thaJeztah thaJeztah force-pushed the 0.11_backport_engine_23.0_rc2 branch from c52d1de to 2e0d4cc Compare July 17, 2023 10:29
@thaJeztah thaJeztah marked this pull request as draft July 17, 2023 10:29
@thaJeztah thaJeztah force-pushed the 0.11_backport_engine_23.0_rc2 branch from 2e0d4cc to d39a556 Compare July 20, 2023 22:09
@thaJeztah thaJeztah changed the title [0.11] vendor: github.com/docker/docker 0420d2b33c42a9f0708c71a18948e60e1b9e4191 (v23.0.7-dev) [0.11] vendor: github.com/docker/docker 0cae31c7dd6e08b96994e22c059c132a70119f7c (v23.0.7-dev) Jul 20, 2023
@thaJeztah
vendor: github.com/docker/docker v23.0.0-rc.2
dc00d08 
full diff: moby/moby@v23.0.0-rc.1...v23.0.0-rc.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 435bc89)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.0-rc.2
b4c8369 
full diff: docker/cli@v23.0.0-rc.1...v23.0.0-rc.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit d434b0c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: golang.org/x/sys v0.4.0
0724cda 
full diff: golang/sys@v0.3.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 9ab4438)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: golang.org/x/text v0.6.0
4fa5aed 
no changes in vendored code

full diff: golang/text@v0.5.0...v0.6.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0b91c1c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: golang.org/x/net v0.5.0
f20344a 
full diff: golang/net@v0.4.0...v0.5.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 23a4805)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.0-rc.3
b5d5be9 
full diff: moby/moby@v23.0.0-rc.2...v23.0.0-rc.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0cd6603)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.0-rc.3
52a9650 
no changes in vendored code

full diff: docker/cli@v23.0.0-rc.2...v23.0.0-rc.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit bd9ca4b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.0
2f7f0d2 
client: improve error messaging on crash

full diff: moby/moby@v23.0.0-rc.3...v23.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit ed55ccd)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.0
15555fe 
Fix issue where one bad credential helper causes none to be returned

full diff: docker/cli@v23.0.0-rc.3...v23.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 8b3d368)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.1
87ccc55 
no changes in vendored files

full diff: moby/moby@v23.0.0...v23.0.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0572532)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.1
4a939d7 
no changes in vendored files

full diff: docker/cli@v23.0.0...v23.0.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 617bd6d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.2
65861a1 
relevant changes:

- Migrate away from things deprecated in Go 1.20
  The deprecated constant tar.TypeRegA is the same value as
  tar.TypeReg and so is not needed at all.

full diff: moby/moby@v23.0.1...v23.0.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 6051cd1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.2
cde6e0a 
no changes in vendored code

full diff: docker/cli@v23.0.1...v23.0.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c4ce183)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: golang.org/x/time v0.3.0
b82a484 
full diff: golang/time@v0.1.0...v0.3.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit ca62cff)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.4
99a99cb 
full diff: docker/cli@v23.0.2...v23.0.4

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 28d9f0b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.4
9aeb5fc 
no changes in vendored files

full diff: moby/moby@v23.0.3...v23.0.4

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c089b9d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/docker v23.0.5
cf03022 
full diff: moby/moby@v23.0.4...v23.0.5

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit bc460d6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/cli v23.0.5
3ed1223 
full diff: docker/cli@v23.0.4...v23.0.5

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 50e57e7)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
dependabot bot and others added 4 commits July 21, 2023 13:17
@dependabot @thaJeztah
build(deps): bump github.com/docker/distribution
f9258d4 
Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.1+incompatible to 2.8.2+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](distribution/distribution@v2.8.1...v2.8.2)

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 5733d57)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
[0.11] vendor: github.com/docker/docker v23.0.6
bcbe0cb 
full diff: moby/moby@v23.0.5...v23.0.6

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
[0.11] vendor: github.com/docker/cli v23.0.6
77f505f 
full diff: docker/cli@v23.0.5...v23.0.6

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
[0.11] vendor: github.com/docker/docker 0cae31c7dd6e08b96994e22c059c1…
547ed8a 
…32a70119f7c (v23.0.7-dev)

relevant changes:

- remove name_to_handle_at(2) from filtered syscalls and add it to allow-list
- client: define a "dummy" hostname to use for local connections
  fixed compatibility with go1.19.11 and go1.20.6

full diff: https://github.com/docker/docke/rcompare/v23.0.6...0cae31c7dd6e08b96994e22c059c132a70119f7c

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 0.11_backport_engine_23.0_rc2 branch from d39a556 to 547ed8a Compare July 21, 2023 11:17
@thaJeztah thaJeztah marked this pull request as ready for review July 21, 2023 11:17
@thaJeztah
Copy link
Member Author

Rebased after #4030 and #3884 were merged

@thaJeztah
Copy link
Member Author

All ✅

@jedevc @crazy-max PTAL 🤗

@crazy-max crazy-max merged commit 9a9de95 into moby:v0.11 Jul 21, 2023
41 checks passed
@thaJeztah thaJeztah deleted the 0.11_backport_engine_23.0_rc2 branch July 21, 2023 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@jedevc jedevc jedevc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thaJeztah @jedevc @AkihiroSuda @crazy-max