beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39570 commits 14 branches 412 tags 338 MiB
Commit graph

39570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
5f9753ae73
client: remove containerd "platform" dependency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9d7495c2b3500565986e3ab8d571c57e296a980d)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2022-03-22 16:34:19 -04:00
Sebastiaan van Stijn
4df345e65d
client: remove unused Platform field from configWrapper 
This field was added in 7a9cb29fb9,
but appears to be unused, so removing it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3994e0ce7855b0dc845c558304e4c1e7a89f0929)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2022-03-22 16:34:08 -04:00
Sebastiaan van Stijn
906f57ff5b
Merge pull request #43333 from pete-woods/20.10-backport-43291-schema-download-retry 
[20.10 backport] distribution: retry downloading schema config on retryable error
 2022-03-06 21:52:27 +01:00
Pete Woods
ce3b6d1ae9
distribution: retry downloading schema config on retryable error 
fixes #43267

Signed-off-by: Pete Woods <pete.woods@circleci.com>

# Conflicts:
#	distribution/pull_v2.go
#	distribution/pull_v2_test.go
#	distribution/xfer/transfer.go
 2022-03-05 20:29:10 +00:00
Sebastiaan van Stijn
c3dec607c3
Merge pull request #43329 from thaJeztah/20.10_backport_update_containerd_binary_1.5.10 
[20.10 backport] update containerd binary to v1.5.10
 2022-03-04 21:17:02 +01:00
Sebastiaan van Stijn
180f3b9cc7
update containerd binary to v1.5.10 
Welcome to the v1.5.10 release of containerd!

The tenth patch release for containerd 1.5 includes a fix for [CVE-2022-23648][1]
and other issues.

Notable Updates

- Use fs.RootPath when mounting volumes (GHSA-crp2-qrr5-8pq7)
- Return init pid when clean dead shim in runc.v1/v2 shims
- Handle sigint/sigterm in shimv2
- Use readonly mount to read user/group info

[1]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23648
[2]: https://github.com/containerd/containerd/security/advisories/GHSA-crp2-qrr5-8pq7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2c8f0a0c99)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-03-04 19:36:34 +01:00
Samuel Karp
409d7ac7f2
Merge pull request #43326 from thaJeztah/20.10_bump_go_1.16.15 2022-03-04 10:09:10 -08:00
Sebastiaan van Stijn
0fa0d70489
[20.10] update to go 1.16.15 to address CVE-2022-24921 
Addresses [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921)

go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and to the net package.
See the Go 1.16.15 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.15+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.16.14...go1.16.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-03-04 16:42:56 +01:00
Brian Goff
c4f6167be1
Merge pull request #43259 from thaJeztah/20.10_backport_fix_lock 
[20.10 backport] vendor: bump etcd v3.3.27
 2022-03-03 11:12:52 -08:00
Sebastiaan van Stijn
9a57c5c4c9
Merge pull request #43260 from thaJeztah/20.10_backport_docs_fixes 
[20.10 backport] docs: assorted docs and swagger fixes
 2022-03-03 20:10:01 +01:00
Sebastiaan van Stijn
4679ffd01c
docs: remove HostConfig.LxcConf field from API docs 
Commit 3b5fac462d  / docker 1.10 removed support
for the LXC runtime, and removed the corresponding fields from the API (v1.22).

This patch removes the `HostConfig.LxcConf` field from the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 839e2ecc1b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:21:13 +01:00
Sebastiaan van Stijn
fbbe1fcfd8
api: remove HostConfig.LxcConf field 
Commit 3b5fac462d  / docker 1.10 removed support
for the LXC runtime, and removed the corresponding fields from the API (v1.22).

This patch removes the `HostConfig.LxcConf` field from the swagger definition.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75a1ad0c9f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:21:10 +01:00
Sebastiaan van Stijn
a5a697143d
docs: fixing /exec/{id}/resize response code in API documentation 
This takes the changes from 1a933e113d and
834272f978, and applies them to older API
versions in the docs directory (which are used for the actual documentation).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2145f3ba2c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:20:25 +01:00
Thomas LEDOS
42b13c09a6
Added error codes for exec resize in API docs 
Signed-off-by: Thomas LEDOS <thomas.ledos92@gmail.com>
(cherry picked from commit 834272f978)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:20:09 +01:00
Thomas LEDOS
aa69e8ed3f
Fixed exec resize success code in API docs 
Signed-off-by: Thomas LEDOS <thomas.ledos92@gmail.com>
(cherry picked from commit 1a933e113d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:19:58 +01:00
Felipe Ruhland
ca5ba4890e
Fix typo on the v1.41 changelog 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
(cherry picked from commit eefb6c672a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 13:19:21 +01:00
Kir Kolyshkin
db214206e5
vendor: bump etcd v3.3.27 
Bump etcd to v3.3.27, which includes https://github.com/etcd-io/etcd/pull/12552,
to fix https://github.com/moby/moby/issues/31182

Full diff: https://github.com/coreos/etcd/compare/v3.3.25...v3.3.27

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ffd5a20ab8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 12:55:15 +01:00
Sebastiaan van Stijn
df6a536193
vendor: github.com/coreos/etcd v3.3.25 
full diff: https://github.com/coreos/etcd/compare/v3.3.12...v3.3.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2bef937507)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-18 12:54:48 +01:00
Sebastiaan van Stijn
3d5fb9425e
Merge pull request #43167 from thaJeztah/20.10_backport_jenkinsfile_remove_rs1 
[20.10 backport] Jenkinsfile: remove Windows RS1 as it reached end of support
 2022-02-17 20:10:45 +01:00
Sebastiaan van Stijn
1eef444005
Merge pull request #43171 from thaJeztah/20.10_backport_api_docs_fixes 
[20.10 backport] docs: update API v1.41 and v1.40 docs with fixes from api/swagger
 2022-02-17 20:10:26 +01:00
Brian Goff
7f44d606f9
Merge pull request #43166 from thaJeztah/20.10_backport_fix_update_sync 
[20.10 backport] Fix for lack of syncronization in daemon/update.go
 2022-02-17 11:08:56 -08:00
Tianon Gravi
c9e1608dd4
Merge pull request #43243 from thaJeztah/20.10_update_go_1.16.14 
[20.10] Update Go to 1.16.14
 2022-02-15 13:13:37 -08:00
Sebastiaan van Stijn
9502dec32f
[20.10] Update Go to 1.16.14 
Includes security fixes for crypto/elliptic (CVE-2022-23806), math/big (CVE-2022-23772),
and cmd/go (CVE-2022-23773).

go1.16.14 (released 2022-02-10) includes security fixes to the crypto/elliptic,
math/big packages and to the go command, as well as bug fixes to the compiler,
linker, runtime, the go command, and the debug/macho, debug/pe, net/http/httptest,
and testing packages. See the Go 1.16.14 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.14+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.16.13...go1.16.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-15 16:22:00 +01:00
Akihiro Suda
879dd468dc
Merge pull request #43215 from thaJeztah/20.10_backport_fix_overlay_fuse_permissions 
[20.10 backport] daemon/graphdriver/fuse-overlayfs: Init(): fix directory permissions (staticcheck)
 2022-02-12 12:10:29 +09:00
Sebastiaan van Stijn
9edb93886a
Merge pull request #43151 from thaJeztah/20.10_backport_containerd_15 
[20.10 backport] update containerd binary v1.5.9, runc v1.0.3, and some script changes
 2022-02-10 20:36:31 +01:00
Sebastiaan van Stijn
878b9de935
daemon/graphdriver/fuse-overlayfs: Init(): fix directory permissions (staticcheck) 
daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go:101:63: SA9002: file mode '700' evaluates to 01274; did you mean '0700'? (staticcheck)
        if err := idtools.MkdirAllAndChown(path.Join(home, linkDir), 700, currentID); err != nil {
                                                                     ^

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f9fb5d4f25)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-08 13:38:29 +01:00
Sebastiaan van Stijn
606c29418a
Merge pull request #43177 from thaJeztah/20.10_update_distribution 
[20.10] vendor: github.com/docker/distribution v2.8.0
 2022-02-08 09:40:46 +01:00
Sebastiaan van Stijn
d1b3497bfa
[20.10] vendor: github.com/docker/distribution v2.8.0 
full diff: 58f99e93b7...distribution:v2.8.0

(taking my own fork for the diff link, as the samuelkarp fork didn't have a reference to the upstream)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-07 18:37:21 +01:00
Brian Goff
dd61d8dc4b
Merge pull request #43165 from thaJeztah/20.10_backport_logs_fixes 
[20.10 backport] daemon/logger: read the length header correctly
 2022-01-27 10:15:00 -08:00
Sebastiaan van Stijn
f9344b45fe
api/swagger: move DistributionInspect to definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 16cb04c2e8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:21 +01:00
Sebastiaan van Stijn
13cb9d9723
api/swagger: rename PluginPrivilegeItem to PluginPrivilege 
To match the name in Go

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ebd709f80c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:19 +01:00
Sebastiaan van Stijn
7f9760e10c
api/swagger: fix up event-types and move to definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0b5a2e3c87)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:18 +01:00
Sebastiaan van Stijn
e6739a2884
api/swagger: move DistributionInspect to definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a65804adc4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:17 +01:00
Sebastiaan van Stijn
d445d24804
api/swagger: rename PluginPrivilegeItem to PluginPrivilege 
To match the name in Go

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 24a43d934c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:16 +01:00
Sebastiaan van Stijn
5e38ae84b2
api/swagger: fix up event-types and move to definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 92ed6ca356)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:14 +01:00
Tobias Gesellchen
012fdff916
Fix swagger docs to match the opencontainers image-spec 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 62cf748df9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:13 +01:00
Tobias Gesellchen
13cbf7fbb7
Extract PluginPrivilegeItem as explicit type definition 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6153c2f08d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:12 +01:00
Tobias Gesellchen
8fbcf0611b
Use explicit object names for improved swagger based code generation 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit be93e50a58)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:11 +01:00
Tobias Gesellchen
b8bee972c4
Fix ContainerSummary swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8168d1877d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:09 +01:00
Tobias Gesellchen
7092a6091c
Add "changes" query parameter for /image/create to swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e719f8a00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:08 +01:00
Tobias Gesellchen
adf1e470a1
Add RestartPolicy "no" to swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d3d78c1ae3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:07 +01:00
Tobias Gesellchen
b4b469eac2
Fix swagger docs to match the opencontainers image-spec 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c0bc82cef1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:06 +01:00
Tobias Gesellchen
2c38a2a635
Extract PluginPrivilegeItem as explicit type definition 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7248ebcd7e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:04 +01:00
Tobias Gesellchen
621bfddd6e
Use explicit object names for improved swagger based code generation 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6e421a1823)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:03 +01:00
Tobias Gesellchen
8a5240a8aa
Fix ContainerSummary swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9ac2d04617)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:02 +01:00
Tobias Gesellchen
751cf68e36
Add "changes" query parameter for /image/create to swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 050f5f29f7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:03:00 +01:00
Tobias Gesellchen
a961b76aef
Add RestartPolicy "no" to swagger docs 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 90294e9bdb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 16:02:49 +01:00
Sebastiaan van Stijn
ad21bcd94e
Jenkinsfile: remove Windows RS1 as it reached end of support 
It was already disabled by default, but removing it now that it reached
end of the line.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9326ea5b99)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 10:14:29 +01:00
dmytro.iakovliev
b2684c1857
Fix for lack of syncromization in daemon/update.go 
Signed-off-by: dmytro.iakovliev <dmytro.iakovliev@zodiacsystems.com>
(cherry picked from commit 58825ffc32)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 09:55:17 +01:00
Kazuyoshi Kato
8268f70ebb
daemon/logger: replace flaky TestFollowLogsHandleDecodeErr 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit c91e09bee2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-01-20 09:40:19 +01:00