summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | pkg/directory: remove unused MoveToSubdir() utilitySebastiaan van Stijn2022-11-052-71/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This utility was added in 442b45628ee12ebd8e8bd08497896d5fa8eec4bd as part of user-namespaces, and first used in 44e1023a93a0107d63d5400695cbbc6da498a425 to set up the daemon root, and move the existing content; https://github.com/docker/docker/blob/44e1023a93a0107d63d5400695cbbc6da498a425/daemon/daemon_experimental.go#L68-L71 A later iteration no longer _moved_ the existing root directory, and removed the use of `directory.MoveToSubdir()` e8532023f20498e6eb1ce5c079dc8a09aeae3061 It looks like there's no external consumers of this utility, so we should be save to remove it. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 26659d5eb83330269ef634713435a995caa1e2e6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | pkg/directory: minor refactor of Size()Sebastiaan van Stijn2022-11-053-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - separate exported function from implementation, to allow for GoDoc to be maintained in a single location. - don't use named return variables (no "bare" return, and potentially shadowing variables) - reverse the `os.IsNotExist(err) && d != dir` condition, putting the "lighter" `d != dir` first. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit bd6217bb74644d245ce6271138f4c660415fa0fb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | pkg/system: unconvertSebastiaan van Stijn2022-11-051-2/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ab677c41ea215cbb2f81c15a6d8a7ba505aff05a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | pkg/system: move GetExitCode() to pkg/idtools, and un-exportSebastiaan van Stijn2022-11-052-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This utility was only used in a single place, and had no external consumers. Move it to where it's used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 07b1aa822cc7b371ef5925940d8ea8cfb54de57e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | pkg/system: remove Umask() utilitySebastiaan van Stijn2022-11-057-40/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used in a couple of places, and in most places shouldn't be used as those locations were in unix/linux-only files, so didn't need the wrapper. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4347080b46b9143dd1b046b93543b8ed30f55ea6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | pkg/directory: Size(): add back type-casts to account for platform differencesSebastiaan van Stijn2022-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed the comment above this code, but didn't see a corresponding type-cast. Looking at this file's history, I found that these were removed as part of 2f5f0af3fdb7e9ee607a0e178dbe2af6e10cccf4, which looks to have overlooked some deliberate type-casts. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 0a861e68df30a5d1e72bac99fe259149507cf354) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #44480 from neersighted/drop_changelog_22.06Sebastiaan van Stijn2022-11-174-3648/+0
|\ \ \ | | | | | | | | [22.06 backport] cleanup: drop historical CHANGELOG.md
| * | | hack/validate: drop changelog-related stepsBjorn Neergaard2022-11-163-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit be18f92bf4763adf789de7406d1197735aac8027) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
| * | | cleanup: drop historical CHANGELOG.mdBjorn Neergaard2022-11-161-3609/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The file will still be available in Git history; we should drop it however as it is misleading and obsolete. Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit ec1bb216490d2cf37e50852e565cdee96d40e6bf) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
* | | Merge pull request #44471 from thaJeztah/22.06_backport_containerd_v1.6.10Sebastiaan van Stijn2022-11-178-15/+15
|\ \ \ | | | | | | | | [22.06 backport] update containerd v1.6.10 (binary and vendor)
| * | | update containerd binary to v1.6.10Jintao Zhang2022-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> (cherry picked from commit a5979a2106c81dcad1155f64e6faff5b63ba5537) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: github.com/containerd/containerd v1.6.10Jintao Zhang2022-11-166-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> (cherry picked from commit 4e5c3b82cb946de48661f25381f9e590188817a1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | Merge pull request #44477 from neersighted/drop_derek_22.06Sebastiaan van Stijn2022-11-161-22/+0
|\ \ \ \ | | | | | | | | | | [22.06 backport] cleanup: drop .DEREK.yml
| * | | | cleanup: drop .DEREK.ymlBjorn Neergaard2022-11-161-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit e8ad01594af636bb196811e8f12b20c5225d05f7) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
* | | | | Merge pull request #44473 from thaJeztah/22.06_backport_rootlesskit_1.1.0Sebastiaan van Stijn2022-11-1610-64/+63
|\ \ \ \ \ | |_|_|/ / |/| | | | [22.06 backport] update RootlessKit to v1.1.0
| * | | | rootlesskit.installer: s/vendor.conf/vendor.mod/Akihiro Suda2022-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 7ca03c1a799e526e5378af8f79bfef6b7cd8c65c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | update RootlessKit to v1.1.0Akihiro Suda2022-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit d9fb73014855a11d9aef5b08495ec6a1854b33d4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | vendor: github.com/rootless-containers/rootlesskit v1.1.0Akihiro Suda2022-11-169-61/+60
|/ / / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 08516af897e244c0a3e9b0b782748c647aaa29cf) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | Merge pull request #44468 from thaJeztah/22.06_backport_golang_x_releases_step1Sebastiaan van Stijn2022-11-16222-2347/+20452
|\ \ \ \ | |_|/ / |/| | | [22.06 backport] vendor: golang.org/x/crypto v0.1.0 and other golang.org/x/.. dependencies
| * | | vendor: golang.org/x/oauth2 v0.1.0Sebastiaan van Stijn2022-11-1516-81/+656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. Some notable changes: - authhandler: Add support for PKCE - Introduce new AuthenticationError type returned by errWrappingTokenSource.Token - Add support to set JWT Audience in JWTConfigFromJSON() - google/internal: Add AWS Session Token to Metadata Requests - go.mod: update vulnerable net library - google: add support for "impersonated_service_account" credential type. - google/externalaccount: add support for workforce pool credentials full diff: https://github.com/golang/oauth2/compare/2bc19b11175f...v0.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a6cb8efd81ac4d99ca8c187f2dbe4d2412bc954a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/crypto v0.1.0Sebastiaan van Stijn2022-11-1529-64/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. full diff: https://github.com/golang/crypto/compare/3147a52a75dd...v0.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9d7bd47cb6bcffd1c202e07cc9962d5d3ffc66f4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/net v0.1.0Sebastiaan van Stijn2022-11-1518-92/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. full diff: - https://github.com/golang/net/compare/f3363e06e74c...v0.1.0 - https://github.com/golang/text/compare/v0.3.7...v0.4.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 79f9ffd4017fa935d1c992a4f22a119db3bad51f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/time v0.1.0Sebastiaan van Stijn2022-11-156-55/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. full diff: https://github.com/golang/time/compare/f0f3c7e86c11...v0.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 71fa64a272f453d8ac7f00c7bb10e451d5906424) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/sync v0.1.0Sebastiaan van Stijn2022-11-157-22/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. full diff: https://github.com/golang/sync/compare/036812b2e83c...v0.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4965f19626bc70c8b59ba6391bf4587e3f500188) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/sys v0.1.0Sebastiaan van Stijn2022-11-1532-192/+12494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The golang.org/x/ projects are now doing tagged releases. full diff: https://github.com/golang/sys/compare/84dc82d7e875...v0.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4bb95eef6f6737eba8befbc3abe4ed5fd0eb4fd1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | pkg/loopback: use ioctl helpers from x/sys/unixSebastiaan van Stijn2022-11-154-96/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the IoctlRetInt, IoctlSetInt and IoctlLoopSetStatus64 helper functions defined in the golang.org/x/sys/unix package instead of manually wrapping these using a locally defined function. Inspired by https://github.com/containerd/containerd/commit/3cc3d8a560a9d070466d7d58010beda61db5c1ba Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c7c02eea8117347c5ebd43ef3b9192d43bcdd10b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875Sebastiaan van Stijn2022-11-15132-1751/+6858
|/ / / | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/golang/sys/compare/3c1f35247d10...84dc82d7e875 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6742f74e0eae82ef26340a1e8391fded373b63c9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #44448 from neersighted/actions_deprecations_22.06Sebastiaan van Stijn2022-11-153-8/+8
|\ \ \ | | | | | | | | [22.06 backport] ci(actions): migrate to file-based commands
| * | | ci(actions): bump outdated actions on LinuxBjorn Neergaard2022-11-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit 6a02afa56fd6a529e684d7b7eae21195598958aa) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
| * | | ci(actions): migrate to file-based commandsBjorn Neergaard2022-11-102-3/+3
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit 05575699471c4ba8e233f62f1005814a9afcb3bb) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
* | | Merge pull request #44449 from thaJeztah/22.06_backport_bump_gotest_toolsSebastiaan van Stijn2022-11-1555-1088/+486
|\ \ \ | | | | | | | | [22.06 backport] vendor: gotest.tools/v3 v3.4.0, github.com/google/go-cmp v0.5.9, remove golang.org/x/xerrors
| * | | vendor: gotest.tools/v3 v3.4.0Sebastiaan van Stijn2022-11-1119-109/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removes github.com/spf13/pflag dependency - removes use of deprecated io/ioutil package - drops support for go1.16 full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.3.0...v3.4.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit d43bc2671710b8d4c948b63c2f92399774b3898a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: github.com/google/go-cmp v0.5.9 to remove golang.org/x/xerrors depSebastiaan van Stijn2022-11-1130-878/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/google/go-cmp/compare/v0.5.7...v0.5.9 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 57ba2df970fc8980cdb61ee2363352f2853cd48f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | vendor: gotest.tools v3.3.0Sebastiaan van Stijn2022-11-1110-65/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.2.0...v3.3.0 - golden: accept -update for updating files - assert: golden variables Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3e1601a9802d4c2e6ef136b424fbbd60b8a5e486) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | chore: update supported go version to 1.18+Bjorn Neergaard2022-11-116-59/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 1.16 `io/fs` compatibility code was being built on 1.18 and 1.19. Drop it completely as 1.16 is long EOL, and additionally drop 1.17 as it has been EOL for a month and 1.18 is both the minimum Go supported by the 20.10 branch, as well as a very easy jump from 1.17. Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit 85fa72c599a3c612f4d7a28433c1fcf7db2c3e19) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #44456 from thaJeztah/22.06_backport_bump_buildkit_v0.10.6Akihiro Suda2022-11-1510-36/+41
|\ \ \ | |/ / |/| | [22.06 backport] vendor: github.com/moby/buildkit v0.10.6
| * | vendor: github.com/moby/buildkit v0.10.6Sebastiaan van Stijn2022-11-1410-36/+41
|/ / | | | | | | | | | | | | | | full diff: https://github.com/moby/buildkit/compare/v0.10.5...v0.10.6 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 06e4b7d1f831972c8c1039d83b191eef9af61661) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #44414 from ↵Tianon Gravi2022-11-101-11/+0
|\ \ | | | | | | | | | | | | thaJeztah/22.06_backport_rm_deprecated_arm_fallback [22.06 backport] Remove long-deprecated "arm" fallback
| * | Remove long-deprecated "arm" fallbackTianon Gravi2022-11-051-11/+0
| |/ | | | | | | | | | | | | | | This fallback is used when we filter the manifest list by the user-provided platform and find no matches such that we match the previous Docker behavior (before it supported variant matching). This has been deprecated long enough that I think it's time we finally stop supporting this weird fallback, especially since it makes for buggy behavior like `docker pull --platform linux/arm/v5 alpine:3.16` leading to a `linux/arm/v6` image being pulled (I specified a variant, every manifest list entry specifies a variant, so clearly the only behavior I as a user could reasonably expect is an error that `linux/arm/v5` is not supported, but instead I get an explicitly incompatible image despite doing everything I as a user can to prevent that situation). Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (cherry picked from commit 5bc17c3e54d93b698f6b8e31f68a6e0c9233d95c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #44430 from thaJeztah/22.06_swap_digestsetSebastiaan van Stijn2022-11-103-1/+264
|\ \ | | | | | | [22.06 backport] replace distribution/digestset with opencontainers/go-digest/digestset
| * | replace distribution/digestset with opencontainers/go-digest/digestsetSebastiaan van Stijn2022-11-093-1/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | opencontainers/go-digest is a 1:1 copy of the one in distribution. It's no longer used in distribution itself, so may be removed there at some point. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6174d00c03609980fe8eb1cad40f628e59ae9cef) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #44416 from thaJeztah/22.06_backport_enable_deprecated_checkSebastiaan van Stijn2022-11-101-1/+1
|\ \ \ | |/ / |/| | [22.06 backport] Revert "validation: temporarily allows changes in integration-cli"
| * | Revert "validation: temporarily allows changes in integration-cli"Sebastiaan van Stijn2022-11-051-1/+1
| |/ | | | | | | | | | | | | | | This reverts commit 7ed823ead91938e5cc8de7a42ff93a25abe73e7e. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9b71a46899d8c80e88c95edc972bb0101d36b1f0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #44411 from thaJeztah/22.06_backport_bump_go1.19.3Samuel Karp2022-11-086-6/+6
|\ \ | |/ |/| fixes https://github.com/golang/go/issues/56309
| * Update to Go 1.19.3 to address CVE-2022-41716Cory Snider2022-11-056-6/+6
|/ | | | | | | | | | | | | | | | | | | | | | | On Windows, syscall.StartProcess and os/exec.Cmd did not properly check for invalid environment variable values. A malicious environment variable value could exploit this behavior to set a value for a different environment variable. For example, the environment variable string "A=B\x00C=D" set the variables "A=B" and "C=D". Thanks to RyotaK (https://twitter.com/ryotkak) for reporting this issue. This is CVE-2022-41716 and Go issue https://go.dev/issue/56284. This Go release also fixes https://github.com/golang/go/issues/56309, a runtime bug which can cause random memory corruption when a goroutine exits with runtime.LockOSThread() set. This fix is necessary to unblock work to replace certain uses of pkg/reexec with unshared OS threads. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit f9d4589976c9a1b07506839b053022212362b5f3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #44404 from neersighted/swarmkit_revendor_22.06Sebastiaan van Stijn2022-11-038-16/+63
|\ | | | | [22.06 backport] vendor: github.com/moby/swarmkit/v2 v2.0.0-20221102165002-6341884e5fc9
| * vendor: github.com/moby/swarmkit/v2 v2.0.0-20221102165002-6341884e5fc9Bjorn Neergaard2022-11-038-16/+63
| | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/moby/swarmkit/compare/48dd89375d0a...6341884e5fc9 Pulls in a set of fixes to SwarmKit's nascent Cluster Volumes support discovered during subsequent development and testing. Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> (cherry picked from commit 57c2545cd51c5fe7495c44e46013bbf320645c34) Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
* | Merge pull request #44405 from vvoland/oci-artifacts-error-2206Sebastiaan van Stijn2022-11-032-1/+39
|\ \ | |/ |/| [22.06 backport] distribution: Error when pulling OCI artifacts
| * distribution: Error when pulling OCI artifactsPaweł Gronowski2022-11-032-1/+39
|/ | | | | | | | | | | Currently an attempt to pull a reference which resolves to an OCI artifact (Helm chart for example), results in a bit unrelated error message `invalid rootfs in image configuration`. This provides a more meaningful error in case a user attempts to download a media type which isn't image related. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
* Merge pull request #44400 from ↵Cory Snider2022-11-021-1/+3
|\ | | | | | | | | corhere/backport-22.06/fix-task-delete-on-failed-start [22.06 backport] Fix containerd task deletion after failed start
View Lorry Controller Status