0dd6aa8cc3
Merge pull request #5702 from thaJeztah/bump_x_deps
...
vendor: update golang.org/x/ dependencies for docker/docker
2024-12-17 13:02:23 +01:00
83156e6627
vendor: golang.org/x/net v0.32.0
...
go maintainers annnounced a security release for this module; this patch
already brings it up to the current version in case the security issue
affects us.
full diff: https://github.com/golang/net/compare/v0.31.0...v0.32.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 23:01:20 +01:00
450f6b9955
vendor: golang.org/x/crypto v0.31.0
...
update to the latest version of this dependency, which has a fix for a
authorization bypass in the ssh package. We don't use this functionality,
so there's no need to backport this change (other than de-noising false positives).
This is CVE-2024-45337 and Go issue https://go.dev/issue/70779 .
full diff: https://github.com/golang/crypto/compare/v0.29.0...v0.31.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 22:59:33 +01:00
b74302eb50
vendor: golang.org/x/text v0.21.0
...
no changes in vendored code
full diff: https://github.com/golang/text/compare/v0.20.0...v0.21.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 22:58:24 +01:00
cb2e35286c
vendor: golang.org/x/sync v0.10.0
...
no changes in vendored code
full diff: https://github.com/golang/sync/compare/v0.9.0...v0.10.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 22:57:35 +01:00
e56b665d81
vendor: golang.org/x/sys v0.28.0
...
full diff: https://github.com/golang/sys/compare/v0.27.0...v0.28.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 22:56:51 +01:00
8454e012ca
Merge pull request #5697 from thaJeztah/remove_system_isabs
...
cli/command/container: use local copy of pkg/system.IsAbs
2024-12-16 17:46:27 +01:00
7dd31686e9
Merge pull request #5696 from thaJeztah/remove_use_of_netfilter_fields
...
cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests
2024-12-16 16:25:01 +01:00
1eda498786
cli/command/container: use local copy of pkg/system.IsAbs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-16 10:22:35 +01:00
ffe0354c2c
cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests
...
This is a follow-up to 55e404e7a8https://github.com/moby/moby/commit/db25b0dcd0461802289e962aa0df3abd323d1994
[1]: https://github.com/moby/moby/blob/944e40350259f040950d871d402d848ff2a799bc/libnetwork/drivers/bridge/setup_bridgenetfiltering.go#L16-L77
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-14 15:29:33 +01:00
91d097e70b
Merge pull request #5683 from thaJeztah/bump_xx
...
update xx to v1.6.1 for compatibility with alpine 3.21
2024-12-13 14:38:36 +01:00
5b36e1b34a
Merge pull request #5691 from thaJeztah/remove_netfilter_warnings
...
cli/command/system: remove netfilter warnings from tests
2024-12-13 13:11:14 +01:00
55e404e7a8
cli/command/system: remove netfilter warnings from tests
...
These warnings will no longer be returned by the daemon, so remove
them from the tests as well to make them more representative of
reality.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-13 10:29:01 +01:00
4c2a184aaf
Merge pull request #5689 from thaJeztah/bump_gomd2man
...
update go-md2man to v2.0.5
2024-12-13 02:01:07 +01:00
eaa8b5716d
update go-md2man to v2.0.5
...
full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.4...v2.0.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-13 01:21:51 +01:00
2080e09905
Merge pull request #5599 from robmry/option_ipv4
...
Add option --ipv4
2024-12-12 15:10:48 +00:00
6a2cde6c75
Add option '--ipv4'
...
Signed-off-by: Rob Murray <rob.murray@docker.com >
2024-12-10 15:51:21 +00:00
5c896c95d0
Docs: emphasise that some options that are for docker0
...
Signed-off-by: Rob Murray <rob.murray@docker.com >
2024-12-10 15:51:21 +00:00
26526f9970
Merge pull request #5674 from thaJeztah/registry_trimname
...
registry/client: remove uses of APIEndpoint.TrimHostName
2024-12-10 12:28:12 +01:00
a5353e55da
Docs: include --fixed-cidr-v6 and --bip6 docker0 options
...
Signed-off-by: Rob Murray <rob.murray@docker.com >
2024-12-10 09:44:59 +00:00
1e51ae7af2
update xx to v1.6.1 for compatibility with alpine 3.21
...
This fixes compatibility with alpine 3.21
- Fix additional possible `xx-cc`/`xx-cargo` compatibility issue with Alpine 3.21
- Support for Alpine 3.21
- Fix `xx-verify` with `file` 5.46+
- Fix possible error taking lock in `xx-apk` in latest Alpine without `coreutils`
full diff: https://github.com/tonistiigi/xx/compare/v1.5.0...v1.6.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-10 10:12:58 +01:00
2a5ac8f5ab
vendor: github.com/docker/docker b249c5ebd214 (master, v28.0.0-dev)
...
full diff: https://github.com/docker/docker/compare/5d72419486fe...b249c5ebd214e2977d0fdb1e07d82366f5849cf9
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-09 21:56:05 +01:00
afab765014
registry/client: remove uses of APIEndpoint.TrimHostName
...
This field was added in https://github.com/moby/moby/commit/19515a7ad859b28c474d81e756ac245afcd968e3 ,
but looks to be always set for endpoints used, so we can trim remote names
unconditionally.
This option was added for possible future expansion, allowing registry-
mirrors to get the full reference of the image (including domain-name),
for them to host a mirror for multiple upstreams on the same registry.
That approach will unlikely be implemented, and containerd has a different
approach for this, where the reference to the original registry is passed
through a query parameter instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-09 21:51:02 +01:00
e554bfef6c
Merge pull request #5662 from laurazard/consistent-attach-check
...
run: correctly handle only STDIN attached
2024-12-09 18:01:45 +01:00
619ea8e134
Merge pull request #5673 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker 5d72419486fe (master, v28.0.0-dev)
2024-12-09 17:43:27 +01:00
7dab597e6d
tests: cleanup comment
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-12-09 15:49:21 +00:00
30c4637f03
run: don't hang if only attaching STDIN
...
If STDOUT or STDERR are attached and the container exits, the streams
will be closed by the daemon while the container is exiting, causing
the streamer to return an error
https://github.com/docker/cli/blob/61b02e636d2afed778f2e871c3ec1c6adee69ca4/cli/command/container/hijack.go#L53
that gets sent
https://github.com/docker/cli/blob/61b02e636d2afed778f2e871c3ec1c6adee69ca4/cli/command/container/run.go#L278
and received
https://github.com/docker/cli/blob/61b02e636d2afed778f2e871c3ec1c6adee69ca4/cli/command/container/run.go#L225
on `errCh`.
However, if only STDIN is attached, it's not closed (since this is
attached to the user's TTY) when the container exits, so the streamer
doesn't exit and nothing gets sent on `errCh`, meaning the CLI execution
hangs receiving on `errCh` on L231.
Change the logic to receive on both `errCh` and `statusChan` – this way,
if the container exits, we get notified on `statusChan` (even if only
STDIN is attached), and can cancel the streamer and exit.
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-12-09 15:49:20 +00:00
2eb77f4ede
vendor: github.com/docker/docker 5d72419486fe (master, v28.0.0-dev)
...
full diff: https://github.com/docker/docker/compare/87fbd9cd3b37...5d72419486fef6db1c8765beae6f83a38571b307
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-09 12:41:45 +01:00
9dfdffa015
Merge pull request #5672 from thaJeztah/bump_protobuf
...
vendor: google.golang.org/protobuf v1.35.2
2024-12-09 12:11:31 +01:00
395716be3f
Merge pull request #5679 from thaJeztah/remove_use_of_nondistributable_artifacts
...
cli/command/system: don't use "non-distributable-artifacts" fields in tests
2024-12-09 12:05:53 +01:00
be6ddae56d
Merge pull request #5671 from thaJeztah/bump_x_deps
2024-12-09 11:49:04 +01:00
b51a71148f
cli/command/system: don't use "non-distributable-artifacts" fields in tests
...
Nondistributable artifacts are deprecated, and no longer used; we'll be
deprecating these fields, so let's already skip their use.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-07 12:24:59 +01:00
f50dea6c40
vendor: google.golang.org/protobuf v1.35.2
...
full diff: https://github.com/protocolbuffers/protobuf-go/compare/v1.35.1...v1.35.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:45:30 +01:00
9399483f7a
vendor: golang.org/x/net v0.31.0
...
full diff: https://github.com/golang/net/compare/v0.30.0...v0.31.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:40:39 +01:00
6751bcc972
vendor: golang.org/x/crypto v0.29.0
...
no changes in vendored code
full diff: https://github.com/golang/crypto/compare/v0.28.0...v0.29.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:39:54 +01:00
d41ab7703a
vendor: golang.org/x/term v0.26.0
...
full diff: https://github.com/golang/term/compare/v0.25.0...v0.26.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:38:55 +01:00
5972025fae
vendor: golang.org/x/text v0.20.0
...
no changes in vendored code
full diff: https://github.com/golang/text/compare/v0.19.0...v0.20.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:35:41 +01:00
feb1e2a34c
vendor: golang.org/x/sync v0.9.0
...
no changes in vendored code
full diff: https://github.com/golang/sync/compare/v0.8.0...v0.9.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:34:43 +01:00
4c27c895f2
vendor: golang.org/x/sys v0.27.0
...
full diff: https://github.com/golang/sys/compare/v0.26.0...v0.27.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-06 22:33:47 +01:00
66dfe6d428
Merge pull request #5664 from akerouanton/gw-priority
...
run, create, connect: add support for gw-priority
2024-12-06 22:20:57 +01:00
97010d13f3
Merge pull request #5667 from thaJeztah/login_clean
...
cli/command/registry: assorted refactor and test changes
2024-12-06 14:42:22 +01:00
e7078bf20c
Merge pull request #5668 from thaJeztah/update_go_1.23.4
...
update to go1.23.4
2024-12-04 13:14:52 +01:00
a1e57ac72d
update to go1.23.4
...
go1.23.4 (released 2024-12-03) includes fixes to the compiler, the runtime,
the trace command, and the syscall package. See the Go 1.23.4 milestone on
our issue tracker for details:
- https://github.com/golang/go/issues?q=milestone%3AGo1.23.4+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.23.3...go1.23.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-04 10:33:14 +01:00
e398d16c04
cli/command/registry: return status only instead of whole response
...
Various functions were passing through the API response as a whole, but
effectively only needed it for a status message (if any). Reduce what's
returned to only the message.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 19:04:24 +01:00
297afb2a2b
cli/command/registry: TestLoginWithCredStoreCreds slight refactor
...
- also check errors that were previously not handled
- use the fakeCLI's buffer instead of creating one manually
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 18:42:40 +01:00
575e373669
cli/command/registry: rename some vars that collided with imports
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 18:37:35 +01:00
d4db289eb5
run, create, connect: add support for gw-priority
...
Signed-off-by: Albin Kerouanton <albinker@gmail.com >
2024-12-03 15:13:08 +01:00
cf89afb32b
cli/command/registry: storeCredentials: accept configfile as arg
...
This function only needs access to the configfile
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 13:00:59 +01:00
b5a00d0b0f
cli/command/registry: loginWithRegistry: use shallower interface
...
This function only needs the API client, not all of the CLI.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 12:50:12 +01:00
13f0d46411
cli/command/registry: don't return creds on error
...
Be more explicit on not returning a response if there was an error;
change some non-exported functions to return a pointer, and return
nil instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-12-03 12:48:12 +01:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Albin Kerouanton
Rob Murray
Rob Murray
Laura Brehm
Albin Kerouanton