2c17edf804
cli/connhelper/commandcon.New: pass context with WithoutCancel
...
Passing the context to the constructor, but explicitly making it
non-cancelable and add a comment describing why context-cancelation
should not be propagated.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-10 21:41:48 +01:00
e6ee7ea94b
Merge pull request #5730 from thelovekesh/update/help-template
...
Remove preceding white space from cobra help template
2025-02-10 19:02:55 +01:00
f7c3d1c796
Merge pull request #5815 from thaJeztah/bump_buildx
...
Dockerfile: dev-container: update buildx v0.20.1
2025-02-10 10:36:10 +00:00
661d079b1e
Merge pull request #5805 from thaJeztah/vendor_28.0.0-rc.1
...
vendor: github.com/docker/docker/v28.0.0-rc.1
2025-02-10 10:32:17 +00:00
61a3b4bd50
Remove preceding white space from cobra help template
...
Signed-off-by: thelovekesh <lovekesh.kumar@rtcamp.com >
Signed-off-by: Lovekesh Kumar <lovekesh.kumar@rtcamp.com >
2025-02-10 10:51:25 +01:00
bca1f17da8
Merge pull request #5808 from thaJeztah/bump_gotest_tools
...
vendor: gotest.tools/v3 v3.5.2
2025-02-10 10:49:09 +01:00
3560bdded9
Merge pull request #5809 from thaJeztah/bump_golangci_lint
...
Dockerfile: update golangci-lint to v1.63.4
2025-02-10 10:47:35 +01:00
1acf32cdc6
Dockerfile: dev-container: update buildx v0.20.1
...
Also align versions in the Dockerfile.dev Dockerfile
full diff: https://github.com/docker/buildx/compare/v0.20.0...v0.20.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-10 10:09:42 +01:00
7a72f38947
Merge pull request #5810 from thaJeztah/bump_gotestsum
...
Dockerfile: bump gotest.tools/gotestsum v1.12.0
2025-02-10 09:37:21 +01:00
aecc31039d
Dockerfile: bump gotest.tools/gotestsum v1.12.0
...
full diff: https://github.com/gotestyourself/gotestsum/compare/v1.10.0...v1.12.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-09 16:36:17 +01:00
e1a9d1cd37
Dockerfile: update golangci-lint to v1.63.4
...
full diff: https://github.com/golangci/golangci-lint/compare/v1.62.0...v1.63.4
Changelog: https://golangci-lint.run/product/changelog/#v1634
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-09 16:29:41 +01:00
df8c19d8fd
vendor: gotest.tools/v3 v3.5.2
...
- un-deprecates `assert.ErrorType`, `cmp.ErrorType`
- assert: ensure message is always displayed and fix under bazel
- poll: Continue(): use format.Message for formatting
- fix TestFromDirSymlink on Windows due to missing drive-letter
- fix various linting issues and minor bugs
full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.5.1...v3.5.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-09 13:39:45 +01:00
3c0d703acd
vendor: github.com/docker/docker/v28.0.0-rc.1
...
no diff; same code but tagged
full diff: https://github.com/docker/docker/compare/6c3797923dcb...v28.0.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-07 01:38:33 +01:00
bf65a46c2c
Merge pull request #5803 from thaJeztah/build_tags
...
build / prepare (push) Has been cancelled
build / build (push) Has been cancelled
build / bin-image (push) Has been cancelled
build / prepare-plugins (push) Has been cancelled
build / plugins (push) Has been cancelled
codeql / codeql (push) Has been cancelled
e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 23, experimental) (push) Has been cancelled
e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 27, experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 23, experimental) (push) Has been cancelled
e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 27, experimental) (push) Has been cancelled
e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-13) (push) Has been cancelled
test / host (macos-14) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-md (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
add //go:build directives to prevent downgrading to go1.16 language
2025-02-06 19:59:01 +01:00
2815d2337b
add //go:build directives to prevent downgrading to go1.16 language
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-06 19:52:03 +01:00
c962084462
Merge pull request #5754 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker 6c3797923dcb (master, v28.0-dev)
2025-02-06 18:26:54 +00:00
01da8a582f
vendor: github.com/docker/docker 6c3797923dcb (master, v28.0-dev)
...
full diff: https://github.com/docker/docker/compare/69687190936d...6c3797923dcb082370a09f9381511da10120bd7b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-06 19:16:50 +01:00
11999b16e4
Merge pull request #5778 from laurazard/add-cause-statuserr
...
Don't print "context canceled" if user terminated
2025-02-06 14:20:38 +00:00
eec977bbea
Merge pull request #5800 from thaJeztah/bump_version
...
bump version to v28.0.0-dev
2025-02-06 13:30:15 +00:00
76e0088b5c
minor cleanup
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2025-02-06 14:16:45 +01:00
85a77af591
Don't print "context canceled" if user terminated
...
Without breaking API compatibility, this patch allows us to know whether
a returned `cli/StatusError` was caused by a context cancellation or
not, which we can use to provide a nicer UX and not print the Go
"context canceled" error message if this is the cause.
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2025-02-06 14:16:20 +01:00
7e83ff7735
bump version to v28.0.0-dev
...
This file is only used as default if no version is specified. We
should probably get rid of this, but let's update it to better
reflect the version that developer builds are building.
https://github.com/docker/cli/blob/d48fb9f9f7bdb6e0ef37dbde68612a1704cad46e/docker.Makefile#L22
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-06 01:41:59 +01:00
d48fb9f9f7
Merge pull request #5795 from vvoland/update-go
...
update to go1.23.6
2025-02-05 19:23:43 +01:00
eb6546b523
Merge pull request #5774 from Benehiko/improve-login-text
...
login: improve text on already authenticated and on OAuth login
2025-02-05 12:06:53 +00:00
6d7afd48a4
login: improve text on already authenticated and on OAuth login
...
Users have trouble understanding the different login paths on the CLI.
The default login is performed through an OAuth flow with the option to
fallback to a username and PAT login using the docker login -u <username>
option.
This patch improves the text around docker login, indicating:
- The username is shown when already authenticated
- Steps the user can take to switch user accounts are printed when
authenticated in an info.
- When not authenticated, the OAuth login flow explains the fallback
clearly to the user in an info.
- The password prompt now explicitly states that it accepts a PAT in an
info.
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com >
2025-02-05 12:32:24 +01:00
9005f36e6e
Merge pull request #5760 from Benehiko/user-terminated-ctx-err
...
cmd/docker: add cause to user-terminated `context.Context`
2025-02-05 12:16:22 +01:00
1d9d349c19
update to go1.23.6
...
- https://github.com/golang/go/issues?q=milestone%3AGo1.23.6+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.23.5...go1.23.6
This minor release include 1 security fix following the security policy:
- crypto/elliptic: timing sidechannel for P-256 on ppc64le
Due to the usage of a variable time instruction in the assembly implementation
of an internal function, a small number of bits of secret scalars are leaked on
the ppc64le architecture. Due to the way this function is used, we do not
believe this leakage is enough to allow recovery of the private key when P-256
is used in any well known protocols.
This is CVE-2025-22866 and Go issue https://go.dev/issue/71383 .
View the release notes for more information:
https://go.dev/doc/devel/release#go1.23.6
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-02-04 20:34:35 +01:00
dff0dc8afa
Merge pull request #5790 from thaJeztah/leftover_cleanups
...
cli/command: some minor cleanups
2025-02-04 12:30:30 +00:00
7c3fa8172b
Merge pull request #5791 from thaJeztah/multi_errors
...
cli/command: use errors.Join instead of our own implementation
2025-02-04 12:23:11 +01:00
5b90e0e4e5
Merge pull request #5744 from vvoland/image-tree-chips
...
image/tree: Chips to represent "in use"
2025-02-04 09:23:24 +00:00
81da375c4d
cli/command/service: runScale: use errors.Join, and cleanup
...
- Use stdlib multi-errors instead of creating our own
- use apiClient instead of client for the API client to
prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
- rewrite runServiceScale to return warnings, instead of printing them
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 20:35:48 +01:00
09b513ecfd
cli/command/service: runRollback: remove intermediate vars
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 20:31:52 +01:00
aa96cb7aa0
cli/command/volume: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 20:31:52 +01:00
be985bd28e
cli/command/stack/swarm: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 20:31:45 +01:00
f1193effc0
cli/command/service: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:36:59 +01:00
f9e4335564
cli/command/secret: use errors.Join
...
- Use stdlib multi-errors instead of creating our own
- use apiClient instead of client for the API client to
prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
- rename runSecretRemove to runRemove to align with other commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:33:58 +01:00
2a9fd4a939
cli/command/node: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:30:56 +01:00
f8729c6da2
cli/command/manifest: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:30:25 +01:00
1fd9d0dd34
cli/command/manifest: pass manifest-store and handle context
...
- pass through the manifest-store, instead of the CLI as a whole
- handle context cancellation
- rename `runRm` to `runRemove` to align with other commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:27:59 +01:00
f431f61568
cli/command/inspect: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:21:27 +01:00
7147e85f63
cli/command/image: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:20:34 +01:00
2b9a4d5f4c
cli/command/context: use errors.Join
...
Use stdlib multi-errors instead of creating our own; also
touch-up one error and some minor cleanups.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:19:18 +01:00
150f27b68c
cli/command/container: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:17:50 +01:00
791e06b435
cli/command/config: RunConfigRemove: use errors.Join
...
Use stdlib multi-errors instead of creating our own
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:16:28 +01:00
632f179e8f
cli/command/image: minor cleanups
...
- use apiClient instead of client for the API client to
prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:08:08 +01:00
e81d76ffe1
cli/command/container: minor cleanups
...
- use apiClient instead of client for the API client to
prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
- suppress some errors to make my IDE and linters happier
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:08:08 +01:00
deaa601189
cli/command/config: minor cleanups
...
- use apiClient instead of client for the API client to
prevent shadowing imports.
- use dockerCLI with Go's standard camelCase casing.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-03 19:08:08 +01:00
ce30966636
Merge pull request #5785 from thaJeztah/checkpoint_test_keeprunning
...
TestCheckpointCreateWithOptions check both "keep-running=true/false"
2025-02-03 18:25:31 +01:00
795b7d5f0a
Merge pull request #5788 from thaJeztah/progress_clean
...
service/progress: ServiceProgress: avoid fuzzy matching service ID in loop
2025-02-03 18:24:52 +01:00
c950d48f72
image/tree: Chips to represent "in use"
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-02-03 18:24:32 +01:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Paweł Gronowski
thelovekesh
Laura Brehm
Alano Terblanche