Sebastiaan van Stijn
36a2dd36a0
Merge pull request #44554 from thaJeztah/remove_outdated_comment
...
vendor.mod: remove outdated comment about replaced module
2022-11-30 17:26:51 +01:00
Sebastiaan van Stijn
3760b589f6
Merge pull request #44462 from neersighted/generate_authors
...
AUTHORS: regenerate, cleanup, refactor
2022-11-30 17:25:40 +01:00
Paweł Gronowski
3d97f1e22d
client/list: Handle SharedSize
...
This makes the `ImageList` function to add `shared-size=1` to the url
query when user caller sets the SharedSize.
SharedSize support was introduced in API version 1.42. This field was
added to the options struct, but client wasn't adjusted.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2022-11-30 17:08:00 +01:00
Sebastiaan van Stijn
1907027b7b
Merge pull request #44520 from vvoland/disk-usage-singleflight
...
daemon/disk_usage: Use context aware singleflight
2022-11-30 13:39:55 +01:00
Sebastiaan van Stijn
86c76aa734
Merge pull request #44548 from thaJeztah/search_remove_id
...
registry: session: remove unused id
2022-11-30 12:08:33 +01:00
Bjorn Neergaard
e1c3305015
AUTHORS: regenerate
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-30 12:05:31 +01:00
Bjorn Neergaard
672383bc56
.mailmap: cleanup and additions
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
2022-11-30 12:05:31 +01:00
Bjorn Neergaard
b94d1604a9
hack/generate-authors.sh: refactor and simplify
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-30 12:05:27 +01:00
Sebastiaan van Stijn
6326ad1729
vendor.mod: remove outdated comment about replaced module
...
The replace was removed in 64f9ea1cf5
, but I
forgot to remove the comment.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-30 11:11:13 +01:00
Sebastiaan van Stijn
9e7ed25c64
Merge pull request #44545 from crazy-max/fix-jenkinsfile
...
Jenkinsfile: Fix dev image build fox ppc64le/s390x archs
2022-11-29 19:25:14 +01:00
Sebastiaan van Stijn
a44f547343
registry: session: remove unused id
...
This removes the dependency on github.com/docker/docker/pkg/stringid
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-29 19:10:07 +01:00
Paweł Gronowski
dec81e489f
daemon/disk_usage: Use context aware singleflight
...
The singleflight function was capturing the context.Context of the first
caller that invoked the `singleflight.Do`. This could cause all
concurrent calls to be cancelled when the first request is cancelled.
singleflight calls were also moved from the ImageService to Daemon, to
avoid having to implement this logic in both graphdriver and containerd
based image services.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2022-11-29 16:46:19 +01:00
CrazyMax
f7e59cbccc
Jenkinsfile: Fix dev image build fox ppc64le/s390x archs
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-29 11:59:09 +01:00
Brian Goff
73261bb8c7
Merge pull request #44533 from crazy-max/makefile-use-buildx
...
Makefile: always use buildx
2022-11-28 19:23:05 -08:00
Akihiro Suda
0e30c50648
Merge pull request #44528 from thaJeztah/update_buildkit_deps2
...
vendor: google.golang.org/grpc v1.50.1
2022-11-29 11:20:49 +09:00
Sebastiaan van Stijn
85fddc0081
distribution: remove unused RequireSchema2
...
It's never set, so we can remove it.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-28 20:29:19 +01:00
Sebastiaan van Stijn
8feeaecb84
use ad-hoc libtrust key
...
This is only used for tests, and the key is not verified anymore, so
instead of creating a key and storing it, we can just use an ad-hoc
one.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-28 20:29:19 +01:00
Sebastiaan van Stijn
e854b2a459
distribution: use ad-hoc trustkey for tests
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-28 20:29:19 +01:00
Sebastiaan van Stijn
5cdd6ab7cd
daemon/config: remove TrustKeyPath, and local utilities
...
Turned out that the loadOrCreateTrustKey() utility was doing exactly the
same as libtrust.LoadOrCreateTrustKey(), so making it a thin wrapped. I kept
the tests to verify the behavior, but we could remove them as we only need this
for our integration tests.
The storage location for the generated key was changed (again as we only need
this for some integration tests), so we can remove the TrustKeyPath from the
config.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-28 20:29:19 +01:00
Sebastiaan van Stijn
1981706196
daemon: remove migrateTrustKeyID()
...
The migration code is in the 22.06 branch, and if we don't migrate
the only side-effect is the daemon's ID being regenerated (as a
UUID).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-28 20:28:55 +01:00
Sebastiaan van Stijn
66ca24d3a2
Merge pull request #44380 from thaJeztah/config_fix_panic
...
daemon/config: use strings.Cut(), fix panic in BuilderGCFilter
2022-11-27 17:18:00 +01:00
Sebastiaan van Stijn
c1756e1b63
update containerd binary to v1.7.0-beta.0
...
release notes: https://github.com/containerd/containerd/releases/tag/v1.7.0-beta.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-26 14:20:28 +01:00
Sebastiaan van Stijn
c1a9e82d3e
vendor: google.golang.org/grpc v1.50.1
...
full diff: https://github.com/grpc/grpc-go/compare/v1.48.0...v1.50.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-26 14:20:00 +01:00
Sebastiaan van Stijn
3910417695
Merge pull request #44527 from thaJeztah/update_buildkit_deps1
...
vendor: update various dependencies in preparation of BuildKit update
2022-11-26 14:18:35 +01:00
Sebastiaan van Stijn
a491d2e8a5
Merge pull request #44539 from crazy-max/ci-timeout
...
ci: define timeout for jobs
2022-11-26 14:13:53 +01:00
CrazyMax
bade242ddd
Makefile: always use buildx
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-25 23:22:53 +01:00
CrazyMax
426e3926ef
ci: define timeout for jobs
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-25 22:57:57 +01:00
Sebastiaan van Stijn
dc52e08bb5
vendor: github.com/prometheus/client_golang v1.14.0
...
full diff: https://github.com/prometheus/client_golang/compare/v1.13.0...v1.14.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:16 +01:00
Sebastiaan van Stijn
b2fe29ba79
vendor: github.com/go-logr/logr v1.2.3
...
full diff: https://github.com/go-logr/logr/compare/v1.2.2...v1.2.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:16 +01:00
Sebastiaan van Stijn
7c1b7842c6
vendor: golang.org/x/crypto v0.2.0
...
- all: use math/bits.RotateLeft
full diff: https://github.com/golang/crypto/compare/v0.1.0...v0.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:16 +01:00
Sebastiaan van Stijn
efe17dbdb4
vendor: golang.org/x/net v0.2.0
...
- http2/hpack: build static table with go generate
full diff: https://github.com/golang/net/compare/v0.1.0...v0.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:16 +01:00
Sebastiaan van Stijn
0588a83380
vendor: github.com/opencontainers/runc v1.1.3
...
no changes in vendored code
full diff: https://github.com/opencontainers/runc/compare/v1.1.2...v1.1.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:15 +01:00
Sebastiaan van Stijn
38adf7a694
vendor: github.com/klauspost/compress v1.15.12
...
full diff: https://github.com/klauspost/compress/compare/v1.15.9...v1.15.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 17:57:15 +01:00
Sebastiaan van Stijn
3df160a410
Merge pull request #44535 from thaJeztah/protobuf_extensions_fix
...
go.mod: golang_protobuf_extensions v1.0.4 - prevent incompatible versions
2022-11-25 17:41:49 +01:00
Sebastiaan van Stijn
458a29d700
Merge pull request #44532 from thaJeztah/sam_curator
...
Add Sam Thibault (sam-thibault) as curator
2022-11-25 17:36:26 +01:00
Sebastiaan van Stijn
e1058e6bc3
go.mod: golang_protobuf_extensions v1.0.4 - prevent incompatible versions
...
This module made a whoopsie, and updated to `google.golang.org/protobuf`
in a patch release, but `google.golang.org/protobuf` is not backward
compatible with `github.com/golang/protobuf`.
Updating the minimum version to v1.0.4 which corrects this, to prevent
users of containerd as a module from accidentally pulling in the wrong
version:
- v1.0.3 switched to use `google.golang.org/protobuf`; https://github.com/matttproud/golang_protobuf_extensions/compare/v1.0.2..v1.0.3
- This was reverted in v1.0.4 (which is the same as v1.0.2); https://github.com/matttproud/golang_protobuf_extensions/compare/v1.0.3..v1.0.4
- And a `v2` was created instead; https://github.com/matttproud/golang_protobuf_extensions/releases/tag/v2.0.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 15:18:24 +01:00
Sebastiaan van Stijn
e5e6480694
Add Sam Thibault (sam-thibault) as curator
...
Sam is on my team, and we started to do weekly triage sessions to
clean up the backlog. Adding him, so that he can help with doing
triage without my assistance :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-25 11:36:12 +01:00
Sebastiaan van Stijn
85b80ce3bb
Merge pull request #44516 from thaJeztah/bump_swarmkit3
...
vendor: github.com/moby/swarmkit/v2 v2.0.0-20221123162438-b17f02f0a054
2022-11-24 10:38:54 +01:00
Sebastiaan van Stijn
23a27d4c8a
Merge pull request #44465 from neersighted/ignorefiles_cleanup
...
ignorefiles: cleanup
2022-11-23 19:53:30 +01:00
Sebastiaan van Stijn
64f9ea1cf5
vendor: github.com/moby/swarmkit/v2 v2.0.0-20221123162438-b17f02f0a054
...
full diff: 6341884e5f...b17f02f0a0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:30:18 +01:00
Sebastiaan van Stijn
a5898e3a2d
vendor: github.com/prometheus/client_golang v1.13.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:22:22 +01:00
Sebastiaan van Stijn
2cc6a86fd3
vendor: github.com/aws/aws-sdk-go v1.37.0
...
full diff: https://github.com/aws/aws-sdk-go/compare/v1.31.6...v1.37.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:20:40 +01:00
Sebastiaan van Stijn
8f1bc3a3b7
vendor: google.golang.org/grpc v1.48.0
...
full diff: https://github.com/grpc/grpc-go/compare/v1.47.0...v1.48.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:19:09 +01:00
Sebastiaan van Stijn
b0e20e1b3c
vendor: go.uber.org/zap v1.21.0
...
full diff: https://github.com/uber-go/zap/compare/v1.17.0...v1.21.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:16:41 +01:00
Sebastiaan van Stijn
066fb6c69e
vendor: go.uber.org/multierr v1.8.0
...
full diff: https://github.com/uber-go/multierr/compare/v1.6.0...v1.8.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:16:41 +01:00
Sebastiaan van Stijn
b41580d66e
vendor: go.uber.org/atomic v1.9.0
...
full diff: https://github.com/uber-go/atomic/compare/v1.7.0...v1.9.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:16:41 +01:00
Sebastiaan van Stijn
341c9e77a8
vendor: github.com/jmespath/go-jmespath v0.4.0
...
no code changes in vendored files
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:16:40 +01:00
Sebastiaan van Stijn
9a8b46518b
vendor: google.golang.org/genproto v0.0.0-20220706185917-7780775163c4
...
no changes in vendored files
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:16:31 +01:00
Sebastiaan van Stijn
1e48b64538
vendor: github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee
...
Fixes a potential panic.
full diff: 9eac43b88a...9f70042a33
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:02:36 +01:00
Sebastiaan van Stijn
4113a88523
vendor: google.golang.org/protobuf v1.28.1
...
indirect dependency, but updating it in a separate commit
full diff: https://github.com/protocolbuffers/protobuf-go/compare/v1.28.0...v1.28.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-23 18:00:44 +01:00