Commit Graph

10514 Commits

Author SHA1 Message Date
2c35778a63 Allow '--link' with '--network bridge'
The '--link' option should only be migrated to an endpoint
option if the network is user-defined ... there was already
an exception for network "default", but not for "bridge".

Signed-off-by: Rob Murray <rob.murray@docker.com>
2025-01-21 16:58:42 +00:00
ad54f757d3 Merge pull request #5761 from thaJeztah/bump_golang_1.23.5
update to go1.23.5 (fix CVE-2024-45341, CVE-2024-45336)
2025-01-21 11:31:58 +01:00
41c2786716 Merge pull request #5663 from Benehiko/ctx-jsonmessage
pkg/command: wrap `jsonmessage.DisplayJSONMessagesStream` with go context
2025-01-21 11:22:40 +01:00
fdb75d2f6b Merge pull request #5765 from thaJeztah/bump_dev_tools
Dockerfile: dev-container: update buildx v0.20.0, compose v2.32.4
2025-01-21 10:34:32 +01:00
1546f023fb Dockerfile: update compose to v2.32.4
Update the compose cli plugin used in the dev-container

full diff: https://github.com/docker/compose/compare/v2.30.3...v2.32.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-21 09:52:10 +01:00
7b07242708 Dockerfile: update buildx to v0.20.0
Update the buildx cli plugin used in the dev-container

full diff: https://github.com/docker/buildx/compare/v0.18.0..v0.20.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-21 09:51:39 +01:00
55e6db580c Merge pull request #5763 from vvoland/gha-relbranches
gha: Adjust release branches
2025-01-20 18:21:18 +01:00
91adb70d6b pkg/command: wrap jsonmessage.DisplayJSONMessagesStream with go context
Allows for the `jsonmessage.DisplayJSONMessagesStream` function
to correctly return when the context is cancelled with the appropriate
reason (`ctx.Error()`) instead of just a nil error.

Follow-up to 30a73ff19c

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
Co-authored-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-01-20 16:36:11 +01:00
81b0bb58ba gha: Adjust release branches
Adjust all workflows to also run on branches like `27.x`

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-01-20 16:35:39 +01:00
3c0691146d update to go1.23.5 (fix CVE-2024-45341, CVE-2024-45336)
go1.23.5 (released 2025-01-16) includes security fixes to the crypto/x509 and
net/http packages, as well as bug fixes to the compiler, the runtime, and the
net package. See the Go 1.23.5 milestone on our issue tracker for details;

- https://github.com/golang/go/issues?q=milestone%3AGo1.23.5+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.23.4...go1.23.5

Hello gophers,

We have just released Go versions 1.23.5 and 1.22.11, minor point releases.

These minor releases include 2 security fixes following the security policy:

- crypto/x509: usage of IPv6 zone IDs can bypass URI name constraints

  A certificate with a URI which has a IPv6 address with a zone ID may
  incorrectly satisfy a URI name constraint that applies to the certificate
  chain.

  Certificates containing URIs are not permitted in the web PKI, so this
  only affects users of private PKIs which make use of URIs.

  Thanks to Juho Forsén of Mattermost for reporting this issue.

  This is CVE-2024-45341 and Go issue https://go.dev/issue/71156.

- net/http: sensitive headers incorrectly sent after cross-domain redirect

  The HTTP client drops sensitive headers after following a cross-domain redirect.
  For example, a request to a.com/ containing an Authorization header which is
  redirected to b.com/ will not send that header to b.com.

  In the event that the client received a subsequent same-domain redirect, however,
  the sensitive headers would be restored. For example, a chain of redirects from
  a.com/, to b.com/1, and finally to b.com/2 would incorrectly send the Authorization
  header to b.com/2.

  Thanks to Kyle Seely for reporting this issue.

  This is CVE-2024-45336 and Go issue https://go.dev/issue/70530.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-20 16:04:17 +01:00
66a584a66d Merge pull request #5757 from vvoland/images-tree-name
image/tree: Print longest names first and use full width
2025-01-20 14:16:19 +01:00
1f3615e756 Merge pull request #5756 from Benehiko/completion-descriptions
cmd/docker: enable cobra completion descriptions
2025-01-20 12:00:12 +01:00
26010e4c3c image/tree: Print longest names first and use full width
When printing image names, sort them by length and print the longest
first. This also allows them to use a full terminal width because they
are not printed alongside other columns.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-01-20 11:25:57 +01:00
f97ec69122 Merge pull request #5758 from vvoland/images-tree-elips-dot
cli/tree: Use single character triple dot
2025-01-20 10:24:00 +01:00
f906139fc8 cli/tree: Use single character triple dot
Using 3 characters instead of 1 to ellipsize a long string is wasteful.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-01-17 14:34:45 +01:00
4c2fece0cb cmd/docker: enable cobra completion descriptions
This patch enables descriptions on the CLI completion script.
It used to be disabled due to the CLI historically not supporting
cobra v2 completions, as seen by this patch
cbec75e2f3.

As an escape hatch, the user can set the `DOCKER_CLI_DISABLE_COMPLETION_DESCRIPTION`
environment variable to disable the completion description when
generating the completion file with `docker completion <fish|bash|zsh>`.

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
2025-01-17 14:30:11 +01:00
f4a68da195 Merge pull request #5752 from thaJeztah/bump_yamlv3
switch to gopkg.in/yaml.v3
2025-01-15 15:24:01 +01:00
58bf0f1846 switch to gopkg.in/yaml.v3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 23:54:33 +01:00
ce293bdb81 Merge pull request #5751 from thaJeztah/update_semconv
cli/command: update semconv to 1.26.0
2025-01-14 20:41:41 +01:00
9abd0ebdf4 cli/command: update semconv to 1.26.0
Align the version with what's used by buildkit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 19:37:57 +01:00
88755df233 Merge pull request #5741 from thaJeztah/vendor_cli_docs_tool
update cli-docs-tool to v0.9.0, go-md2man v2.0.6
2025-01-14 19:36:26 +01:00
5e970091d3 Merge pull request #5750 from thaJeztah/vendor_otel
vendor: otel v0.56.0 / v1.31.0
2025-01-14 19:35:53 +01:00
2f42b32722 vendor: otel v0.56.0 / v1.31.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 19:09:03 +01:00
15e4848a0e Merge pull request #5748 from thaJeztah/vendor_runewidth
vendor: github.com/mattn/go-runewidth v0.0.16
2025-01-14 16:24:58 +01:00
3d9b861165 vendor: github.com/mattn/go-runewidth v0.0.16
adds support for Unicode 15.1.0

full diff: https://github.com/mattn/go-runewidth/compare/v0.0.15...v0.0.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 15:18:35 +01:00
25bdd5ced6 Merge pull request #5747 from thaJeztah/vendor_containerd_platforms
vendor: github.com/containerd/platforms v1.0.0-rc.1
2025-01-14 15:13:42 +01:00
5896278838 Merge pull request #5745 from thaJeztah/vendor_grpc_v1.68.1
vendor: google.golang.org/grpc v1.68.1, google.golang.org/genproto 324edc3d5d38
2025-01-14 15:07:58 +01:00
aa540679e4 vendor: github.com/containerd/platforms v1.0.0-rc.1
full diff: https://github.com/containerd/platforms/compare/v0.2.1...v1.0.0-rc.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 14:28:53 +01:00
1b9bf398bf Merge pull request #5746 from thaJeztah/vendor_pty_v1.1.24
vendor: github.com/creack/pty v1.1.24
2025-01-14 14:17:12 +01:00
d3ca995857 vendor: github.com/creack/pty v1.1.24
full diff: https://github.com/creack/pty/compare/v1.1.21...v1.1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 13:41:12 +01:00
b412f7199a vendor: google.golang.org/grpc v1.68.1, google.golang.org/genproto 324edc3d5d38
full diff: https://github.com/grpc/grpc-go/compare/v1.66.3...v1.68.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-14 13:31:06 +01:00
dbc5cf67eb Merge pull request #5740 from akerouanton/fluentd-async-connect-removal
Drop support for fluentd-async-connect
2025-01-13 19:28:06 +01:00
7244f7d42f update cli-docs-tool to v0.9.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-13 18:59:22 +01:00
6f3ba987b1 vendor: github.com/docker/cli-docs-tool v0.9.0
full diff: https://github.com/docker/cli-docs-tool/compare/v0.8.0...v0.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-13 18:58:31 +01:00
97a14c4561 update go-md2man to v2.0.5
full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.5...v2.0.6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-13 18:58:07 +01:00
acbdad9551 completion: replace fluentd-async-connect with fluentd-async
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
2025-01-13 18:38:24 +01:00
3da5f5893c docs: mark logger opt 'fluentd-async-connect' as removed
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
2025-01-13 18:38:09 +01:00
b462778491 Merge pull request #5708 from thaJeztah/bump_engine
vendor: github.com/docker/docker 69687190936d (master, v28.0-dev)
2025-01-13 13:47:16 +01:00
0df55307c8 vendor: github.com/docker/docker 69687190936d (master, v28.0-dev)
full diff: 50212d215b...6968719093

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-11 01:17:36 +01:00
4e217ae9c1 Merge pull request #5737 from crazy-max/bake-v6
ci: update bake-action to v6
2025-01-10 20:26:52 +01:00
cc571902bc ci: update bake-action to v6
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2025-01-10 16:45:54 +01:00
8e365dd3d8 Merge pull request #5734 from vvoland/gha-build-xbranches
gha/build: Publish bin image for release branches
2025-01-10 14:51:49 +01:00
987befaeac gha/build: Publish bin image for release branches
We moved to the major release branches with a `.x` suffix and forgot to
adjust this workflow to run on branches like `27.x`.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-01-10 14:32:54 +01:00
ff4697d820 Merge pull request #5729 from thaJeztah/cleanup_plugin_install
cli/command/plugin: runCreate: minor cleanup
2025-01-08 18:57:11 +01:00
557afb66d0 Merge pull request #5728 from thaJeztah/vendor_engine
vendor: github.com/docker/docker 50212d215ba7 (master, v28.0-dev)
2025-01-08 18:56:53 +01:00
216674c3e3 vendor: github.com/docker/docker 50212d215ba7 (master, v28.0-dev)
full diff: 6f6c3b9211...50212d215b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-08 18:11:19 +01:00
bf2dae22de cli/command/plugin: runCreate: minor cleanup
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-08 12:53:20 +01:00
a289f11ac8 vendor: github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554
no changes in vendored code

full diff: e8ecf83ee0...8c19597365

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-06 10:28:35 +01:00
667ece32cf Merge pull request #5724 from thaJeztah/deprecate_nondistributable_artifacts
Deprecate configuration for pushing non-distributable artifacts
2025-01-05 14:39:35 +01:00
7e8f94903d docs, man: remove --allow-nondistributable-artifacts flag
This flag is deprecated and no longer functional.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-04 15:18:03 +01:00