Paweł Gronowski
1edc4e07d4
gha: Mirror PR template and validate PR workflow from moby
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-02-12 14:54:10 +01:00
Paweł Gronowski
a3f758fc13
Merge pull request #5820 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker b570831cc3a3 (master, v28.0.0-rc.2)
2025-02-12 10:53:30 +00:00
Sebastiaan van Stijn
c6a7f9a646
vendor: github.com/docker/docker b570831cc3a3 (master, v28.0.0-rc.2)
...
full diff: https://github.com/docker/docker/compare/v28.0.0-rc.1...b570831cc3a3fcfe4edc96af4c249199b019c7dd
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-11 18:06:55 +01:00
Sebastiaan van Stijn
1e3e1bd5f4
Merge pull request #5812 from thaJeztah/bump_gofumpt
...
Dockerfile.dev: bump mvdan.cc/gofumpt to v0.7.0
2025-02-11 16:07:46 +01:00
Sebastiaan van Stijn
235e657b25
Merge pull request #5813 from thaJeztah/bump_goversioninfo
...
Dockerfile.dev: bump github.com/josephspurrier/goversioninfo to v1.4.1
2025-02-11 16:06:48 +01:00
Sebastiaan van Stijn
b7e4fac496
Merge pull request #5819 from thaJeztah/bump_grpc
...
vendor: google.golang.org/grpc v1.69.4
2025-02-11 16:06:16 +01:00
Sebastiaan van Stijn
018bf1b237
vendor: google.golang.org/grpc v1.69.4
...
full diff: https://github.com/grpc/grpc-go/compare/v1.68.1...v1.69.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-11 15:55:27 +01:00
Sebastiaan van Stijn
516e822d4c
Merge pull request #5817 from thaJeztah/bump_pflag
...
vendor: github.com/spf13/pflag v1.0.6, remove local IPNetSliceVar fork
2025-02-11 12:50:51 +01:00
Sebastiaan van Stijn
558ebd5922
vendor: github.com/spf13/pflag v1.0.6, remove local IPNetSliceVar fork
...
- Add exported functions to preserve pkg/flag compatibility
- Add IPNetSlice and unit tests
- Revert the local fork added in 80a2256478 ,
which was pending the upstream feature to be shipped in a release.
full diff: https://github.com/spf13/pflag/compare/v1.0.5...v1.0.6
Revert "Swarm init: use local IPNetSliceValue"
This reverts commit 80a2256478 .
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-11 12:19:51 +01:00
Paweł Gronowski
0af65dc566
Merge pull request #5816 from thaJeztah/connhelper_context
...
cli/connhelper/commandcon.New: pass context with WithoutCancel
2025-02-11 11:00:40 +00:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Paweł Gronowski
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
Paweł Gronowski
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
thelovekesh
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
bb74513ef3
Dockerfile.dev: bump github.com/josephspurrier/goversioninfo to v1.4.1
...
Re-align the version with the main Dockerfile, which was missed when
I updated the version in 93a931920b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-09 17:07:52 +01:00
Sebastiaan van Stijn
7b3f264a69
Dockerfile.dev: bump mvdan.cc/gofumpt to v0.7.0
...
- full diff: https://github.com/mvdan/gofumpt/compare/v0.6.0...v0.7.0
- release notes: https://github.com/mvdan/gofumpt/releases/tag/v0.7.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-02-09 17:04:33 +01:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
v28.0.0-rc.1
2025-02-06 19:59:01 +01:00
Sebastiaan van Stijn
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
Paweł Gronowski
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
Sebastiaan van Stijn
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
Paweł Gronowski
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
Paweł Gronowski
eec977bbea
Merge pull request #5800 from thaJeztah/bump_version
...
bump version to v28.0.0-dev
2025-02-06 13:30:15 +00:00
Laura Brehm
76e0088b5c
minor cleanup
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2025-02-06 14:16:45 +01:00
Laura Brehm
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
d48fb9f9f7
Merge pull request #5795 from vvoland/update-go
...
update to go1.23.6
2025-02-05 19:23:43 +01:00
Paweł Gronowski
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
Alano Terblanche
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
Alano Terblanche
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
Paweł Gronowski
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
Paweł Gronowski
dff0dc8afa
Merge pull request #5790 from thaJeztah/leftover_cleanups
...
cli/command: some minor cleanups
2025-02-04 12:30:30 +00:00
Sebastiaan van Stijn
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
Paweł Gronowski
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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