f9a2af0a49
linting: remove unused nolint comments (nolintlint)
...
cli-plugins/manager/plugin.go:37:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint)
//nolint:gocyclo
^
cli/command/image/formatter_history_test.go:189:2: directive `//nolint:lll` is unused for linter "lll" (nolintlint)
//nolint:lll
^
cli/command/service/list.go:113:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint)
//nolint:gocyclo
^
cli/command/stack/swarm/deploy_composefile.go:178:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint)
//nolint:gocyclo
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 491407b541
2023-02-27 17:02:47 -05:00
01c5120be7
linting: use consts from stdlib (usestdlibvars)
...
cli/command/image/build/context.go:238:23: "400" can be replaced by http.StatusBadRequest (usestdlibvars)
if resp.StatusCode < 400 {
^
cli/trust/trust.go:139:30: "GET" can be replaced by http.MethodGet (usestdlibvars)
req, err := http.NewRequest("GET", endpointStr, nil)
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d3d9301d2d
2023-02-27 17:01:45 -05:00
0573ec2b01
format (GoDoc) comments with Go 1.19 to prepare for go updates
...
Older versions of Go do not format these comments, so we can already
reformat them ahead of time to prevent gofmt linting failing once
we update to Go 1.19 or up.
Result of:
gofmt -s -w $(find . -type f -name '*.go' | grep -v "/vendor/")
With some manual adjusting.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82427d1a07
2023-02-27 17:00:55 -05:00
e501531b5f
cli-plugins/manager: remove uses of deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6c06950cdf
2023-02-27 16:28:59 -05:00
d228386fa0
opts: remove deprecated io/ioutil and use t.Cleanup()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 38e62571fb
2023-02-27 16:28:59 -05:00
3f681a2f64
man: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 85754c9ab5
2023-02-27 16:28:59 -05:00
8793cdd2c7
internal/test: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7491c5ac65
2023-02-27 16:28:59 -05:00
ac72d64c30
e2e: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e89af84ffc
2023-02-27 16:28:59 -05:00
58d486bac7
docs/yaml: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 39ace68061
2023-02-27 16:28:59 -05:00
f471347d88
cmd/docker: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e3197ebd4
2023-02-27 16:28:59 -05:00
a0f0a4fe7a
cli: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 86db51e86e
2023-02-27 16:28:59 -05:00
dc4e6835b7
cli/trust: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e54bca833
2023-02-27 16:28:59 -05:00
f8211f7f80
cli/manifest: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 58cf16da45
2023-02-27 16:28:59 -05:00
cec1b29b81
cli/context: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cca80cdddd
2023-02-27 16:28:59 -05:00
fc37f52414
cli/config: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 71575ab3b5
2023-02-27 16:28:59 -05:00
38e86531d6
cli/compose: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b9f0340b68
2023-02-27 16:28:59 -05:00
8efbfcce25
cli/command: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3f7e7bf9d2
2023-02-27 16:28:59 -05:00
03d93a93c3
cli/command/volume: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cca73bff41
2023-02-27 16:28:59 -05:00
65e4b0e2b3
cli/command/trust: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b5dce3c9e6
2023-02-27 16:28:58 -05:00
3d4a0c1612
cli/command/system: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e0299ff862
2023-02-27 16:27:37 -05:00
b5cd20f67a
cli/command/swarm: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 78cb61c61c
2023-02-27 16:27:37 -05:00
7c6baba23b
cli/command/stack: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d59330f40d
2023-02-27 16:27:37 -05:00
b061531f8c
cli/command/service: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d1f26de646
2023-02-27 16:27:37 -05:00
65893236e0
cli/command/secret: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c558df7ced
2023-02-27 16:27:37 -05:00
0dfc5567bc
cli/command/registry: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3b3a0b898f
2023-02-27 16:27:37 -05:00
d06eafc516
cli/command/plugin: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f61aab59f7
2023-02-27 16:27:37 -05:00
22300128ca
cli/command/node: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9bdeb09ae9
2023-02-27 16:27:37 -05:00
4f3c38a7d9
cli/command/context: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f28c063e2f
2023-02-27 16:27:37 -05:00
5237d943a8
cli/command/manifest: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 43795ec8f7
2023-02-27 16:27:37 -05:00
5c97f5c918
cli/command/image: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d14b5bff80
2023-02-27 16:27:36 -05:00
8d0c8ef081
cli/command/context: remove deprecated io/ioutil and use t.TempDir()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 76b47359cb
2023-02-27 16:27:36 -05:00
b4d152f7ad
cli/command/container: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e946bf0804
2023-02-27 16:27:36 -05:00
54b7933016
cli/command/config: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bc1790c5c2
2023-02-27 16:27:36 -05:00
0a3d9c3e14
cli/command/checkpoint: remove deprecated io/ioutil
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8dc53344e0
2023-02-27 16:27:36 -05:00
715524332f
Merge pull request #3979 from thaJeztah/20.10_backport_docs_ps_size
...
[20.10 backport Fix section docker ps --size
2023-01-18 21:42:16 +01:00
e75544f9a7
Fix section docker ps --size
...
Remove the extra item "Size"
Signed-off-by: Ali Rostami <rostami.ali@gmail.com>
(cherry picked from commit be30cb370e
2023-01-18 21:29:44 +01:00
d4cfac0100
Merge pull request #3976 from thaJeztah/20.10_backport_no_escape
...
[20.10 backport] cli: additionalHelp() don't decorate output if it's piped, and add extra newline
2023-01-18 15:56:05 +01:00
913fa471ad
Add extra newline after additionalHelp output
...
The additionalHelp message is printed at the end of the --help output;
To get more help with docker, check out our guides at https://docs.docker.com/go/guides/
PS>
As this message may contain an URL, users may copy/paste the URL to open it
in their browser, but can easily end up copying their prompt (as there's
no whitespace after it), and as a result end up on a broken URL, for example:
https://docs.docker.com/go/guides/PS
This patch adds an extra newline at the end to provide some whitespace
around the message, making it less error-prone to copy the URL;
To get more help with docker, check out our guides at https://docs.docker.com/go/guides/
PS>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9bb70217f8
2023-01-17 23:12:52 +01:00
1686805f63
cli: additionalHelp() don't decorate output if it's piped
...
This prevents the escape-characters being included when piping the
output, e.g. `docker --help > output.txt`, or `docker --help | something`.
These control-characters could cause issues if users copy/pasted the URL
from the output, resulting in them becoming part of the URL they tried
to visit, which would fail, e.g. when copying the output from:
To get more help with docker, check out our guides at https://docs.docker.com/go/guides/
Users ended up on URLs like;
https://docs.docker.com/go/guides/ESC
https://docs.docker.com/go/guides/%1B [0m
Before this patch, control characters ("bold") would be printed, even if
no TTY was attached;
docker --help > output.txt
cat output.txt | grep 'For more help' | od -c
0000000 033 [ 1 m F o r m o r e h e l
0000020 p o n h o w t o u s e
0000040 D o c k e r , h e a d t o
0000060 h t t p s : / / d o c s . d o c
0000100 k e r . c o m / g o / g u i d e
0000120 s / 033 [ 0 m \n
0000127
docker --help | grep 'For more help' | od -c
0000000 033 [ 1 m F o r m o r e h e l
0000020 p o n h o w t o u s e
0000040 D o c k e r , h e a d t o
0000060 h t t p s : / / d o c s . d o c
0000100 k e r . c o m / g o / g u i d e
0000120 s / 033 [ 0 m \n
0000127
With this patch, no control characters are included:
docker --help > output.txt
cat output.txt | grep 'For more help' | od -c
0000000 F o r m o r e h e l p o n
0000020 h o w t o u s e D o c k
0000040 e r , h e a d t o h t t p
0000060 s : / / d o c s . d o c k e r .
0000100 c o m / g o / g u i d e s / \n
0000117
docker --help | grep 'For more help' | od -c
0000000 F o r m o r e h e l p o n
0000020 h o w t o u s e D o c k
0000040 e r , h e a d t o h t t p
0000060 s : / / d o c s . d o c k e r .
0000100 c o m / g o / g u i d e s / \n
0000117
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 59e74b44ae
2023-01-17 23:12:49 +01:00
91c1ac42ba
Merge pull request #3967 from crazy-max/20.10_fix-docs-anchore
...
[20.10] docs: fix duplicated format anchor in plugin_ls
2023-01-13 18:14:21 +01:00
d512c700d1
docs: fix duplicated format anchor in plugin_ls
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-01-13 16:24:43 +01:00
e4d3f5ebe3
Merge pull request #3959 from thaJeztah/20.10_bump_go_1.18.10
...
[20.10] update to go1.18.10
2023-01-11 16:12:53 +01:00
fa47dff923
[20.10] update to go1.18.10
...
go1.18.10 (released 2023-01-10) includes fixes to cgo, the compiler, the linker,
and the crypto/x509, net/http, and syscall packages. See the Go 1.18.10 milestone
on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.18.10+label%3ACherryPickApproved
full diff: https://github.com/golang/go/compare/go1.18.9...go1.18.10
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-01-11 00:44:06 +01:00
c6ddb858ca
Merge pull request #3957 from thaJeztah/20.10_backport_update_btrfs_status
...
[20.10] deprecation: mark btrfs driver as deprecated for CentOS 7 and RHEL7
2023-01-10 10:30:40 +01:00
8406d5481d
deprecation: mark btrfs driver as deprecated for CentOS 7 and RHEL7
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bdc7e37b30
2023-01-09 19:13:31 +01:00
c01f45379a
Merge pull request #3525 from thaJeztah/20.10_backport_anchor_tags
...
[20.10 backport] docs: add anchor tags for command-line flags
2023-01-09 10:24:22 +01:00
fb1fb991f2
docs: fix anchors
...
Signed-off-by: Kevin Alvarez <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 186dcf30b1
2023-01-07 13:03:46 +01:00
8dcfddb49a
docs: fix some more anchors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 81b051298e
2023-01-07 13:00:40 +01:00
fe865e204b
docs: fix anchor links
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 71e561780a
2023-01-07 13:00:40 +01:00
abdb676065
docs: update link to docker cp
...
Signed-off-by: David Karlsson <david.karlsson@docker.com>
(cherry picked from commit 7c0d6ecf64
2023-01-07 13:00:36 +01:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Ali Rostami
CrazyMax
David Karlsson