9b54d860cd
rm: allow docker container remove as an alias
...
Fix issue 3985
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2023-01-29 08:46:08 +09:00
0288f7f724
Merge pull request #3992 from neersighted/mke_ca_note
...
docs: add note about MKE CA rotation, which is potentially dangerous
2023-01-27 20:57:34 +01:00
00070e6e23
docs: add note about MKE CA rotation, which is potentially dangerous
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com >
2023-01-27 08:19:27 -07:00
645395cc77
Merge pull request #3987 from craig-osterhout/fix-exec-doc-typo
...
Fix typo in reference doc for docker exec
2023-01-24 08:41:29 +01:00
551c4e9ab9
Fix typo in reference doc for docker
...
Signed-off-by: Craig Osterhou <craig.osterhout@docker.com >
Signed-off-by: craig-osterhout <craig.osterhout@docker.com >
2023-01-23 14:05:21 -08:00
5f9c58ffa0
Merge pull request #3984 from thaJeztah/engine_23.0.0-rc.3
...
vendor: github.com/docker/docker v23.0.0-rc.3
2023-01-23 13:38:32 +01:00
8672540f8c
vendor: github.com/docker/docker v23.0.0-rc.3
...
full diff: https://github.com/docker/docker/compare/v23.0.0-rc.2...v23.0.0-rc.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:16 +01:00
c4fff9da13
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230119195359-904c221ac281
...
full diff: https://github.com/mobv/swarmkit/compare/0da442b2780f...904c221ac281
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:16 +01:00
526e5e7c95
vendor: golang.org/x/net v0.5.0
...
full diff: https://github.com/golang/net/compare/v0.4.0...v0.5.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:15 +01:00
d7f21ea9c8
vendor: golang.org/x/term v0.4.0
...
full diff: https://github.com/golang/term/compare/v0.3.0...v0.4.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:01 +01:00
ae43eb0e04
vendor: golang.org/x/text v0.6.0
...
no changes in vendored code
full diff: https://github.com/golang/text/compare/v0.5.0...v0.6.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:48:03 +01:00
caf8b152c6
vendor: golang.org/x/sys v0.4.0
...
full diff: https://github.com/golang/sys/compare/v0.3.0...v0.4.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:45:55 +01:00
e1152b2418
Merge pull request #3977 from alirostami01/master
...
build / build (cross, ) (push) Has been cancelled
build / build (cross, glibc) (push) Has been cancelled
build / build (dynbinary-cross, ) (push) Has been cancelled
build / build (dynbinary-cross, glibc) (push) Has been cancelled
build / plugins (push) Has been cancelled
e2e / e2e (19.03-dind, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, non-experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-11) (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-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
Fix section docker ps --size
2023-01-18 16:46:09 +01:00
be30cb370e
Fix section docker ps --size
...
Remove the extra item "Size"
Signed-off-by: Ali Rostami <rostami.ali@gmail.com >
2023-01-18 13:17:35 +03:30
f7c322edba
Merge pull request #1900 from yuchengwu/8831-doc-user-restrict
...
note `--user` args usage restriction
2023-01-17 23:03:07 +01:00
5d04b1c49e
note --user args usage restriction
...
Signed-off-by: Yucheng Wu <wyc123wyc@gmail.com >
2023-01-17 22:45:23 +01:00
8627a6df16
Merge pull request #3971 from thaJeztah/sync_cobra_streams
...
cli: pass dockerCLI's in/out/err to cobra cmds
2023-01-17 17:57:03 +01:00
fe694e8219
Merge pull request #3973 from thaJeztah/no_escape
...
cli: additionalHelp() don't decorate output if it's piped, and add extra newline
2023-01-17 17:56:07 +01:00
1493806509
Merge pull request #3968 from crazy-max/fix-badges
...
README: fix badges
2023-01-17 15:57:20 +01:00
9bb70217f8
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 >
2023-01-15 15:23:06 +01:00
59e74b44ae
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 >
2023-01-15 15:14:57 +01:00
fc6be6ad30
cli: pass dockerCLI's in/out/err to cobra cmds
...
Both the DockerCLI and Cobra Commands provide accessors for Input, Output,
and Error streams (usually STDIN, STDOUT, STDERR). While we were already
passing DockerCLI's Output to Cobra, we were not doing so for the other
streams (and were passing none for plugin commands), potentially resulting
in DockerCLI output/input to mean something else than a Cobra Command's
intput/output/error.
This patch sets them to the same streams when constructing the Cobra
command.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-15 13:44:33 +01:00
d347678cde
README: fix badges
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-01-13 19:18:26 +01:00
d0a4b6f497
Merge pull request #3966 from crazy-max/fix-docs-anchore
...
docs: fix duplicated format anchor in plugin_ls
2023-01-13 18:15:32 +01:00
e04f3dd0df
docs: fix duplicated format anchor in plugin_ls
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-01-13 16:22:26 +01:00
1af9f22c7e
Merge pull request #2998 from pseyfert/completion/zsh/volume
...
[completion/zsh] add volume completion
2023-01-13 12:22:14 +01:00
f1f12a3332
Merge pull request #3963 from thaJeztah/engine_23.0_rc2
...
vendor: github.com/docker/docker v23.0.0-rc.2
2023-01-12 14:08:40 +01:00
c453cc6873
vendor: github.com/docker/docker v23.0.0-rc.2
...
full diff: https://github.com/docker/docker/compare/v23.0.0-rc.1...v23.0.0-rc.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-12 13:45:27 +01:00
0d16330dd2
vendor: github.com/containerd/containerd v1.6.15
...
no changes to vendored code
full diff: https://github.com/conainerd/containerd/compare/v1.6.14...v1.6.15
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-12 13:43:35 +01:00
257ff41304
Merge pull request #3958 from thaJeztah/bump_go_1.19.5
...
build / build (cross, ) (push) Has been cancelled
build / build (cross, glibc) (push) Has been cancelled
build / build (dynbinary-cross, ) (push) Has been cancelled
build / build (dynbinary-cross, glibc) (push) Has been cancelled
build / plugins (push) Has been cancelled
e2e / e2e (19.03-dind, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, non-experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-11) (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-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
update to go1.19.5
2023-01-11 14:45:52 +01:00
b9e1ad3d19
update to go1.19.5
...
go1.19.5 (released 2023-01-10) includes fixes to the compiler, the linker,
and the crypto/x509, net/http, sync/atomic, and syscall packages. See the
Go 1.19.5 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.19.5+label%3ACherryPickApproved
full diff: https://github.com/golang/go/compare/go1.19.4...go1.19.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-11 00:41:55 +01:00
f163d2441e
Merge pull request #3956 from thaJeztah/update_btrfs_status
...
deprecated: update deprecation for btrfs on CentOS/RHEL 7
2023-01-10 10:30:18 +01:00
d1f02a2733
deprecated: update deprecation for btrfs on CentOS/RHEL 7
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-09 19:04:33 +01:00
4c0a3c3288
Merge pull request #3954 from thaJeztah/deprecate_centos7_btrfs
...
deprecation: mark btrfs driver as deprecated for CentOS 7 and RHEL7
2023-01-09 14:51:26 +01:00
bdc7e37b30
deprecation: mark btrfs driver as deprecated for CentOS 7 and RHEL7
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-09 14:34:59 +01:00
f3ed6db2b1
Merge pull request #3952 from thaJeztah/docs_inspect_trailing_whitespace
...
docs: inspect: remove trailing whitespace from example
2023-01-07 12:48:46 +01:00
35d7fbc818
docs: inspect: remove trailing whitespace from example
...
Current versions of the docs generator take this into account, but on
the 20.10 branch, the trailing whitespace can make the YAML generator
switch to use "compact" formatting, which is hard to read, and hard
to review diffs when updating.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-07 12:24:14 +01:00
d32f0484eb
Merge pull request #3924 from crazy-max/docs-ref-code-delim
...
cmd: set double quotes as code delimiter
2023-01-06 23:18:23 +01:00
79c9e527a3
docs: generate markdown
...
Keep frontmatter for docker, dockerd and index markdown files.
Also needs to move cli.md > docker.md before generation and
then move it back because cli.md is needed for yaml generation on docs
website: https://github.com/docker/cli/pull/3924#discussion_r1059986605
Signed-off-by: Kevin Alvarez <crazy-max@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-06 22:36:47 +01:00
186dcf30b1
docs: fix anchors
...
Signed-off-by: Kevin Alvarez <crazy-max@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-06 22:36:03 +01:00
c49f1ccb49
update cli-docs-tool to v0.5.1
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-01-06 19:15:34 +01:00
5a5b7a61d5
contrib: fix engine logging docs link
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-01-06 19:15:34 +01:00
4595ce588c
cmd: set double quotes as code delimiter
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-01-06 19:15:33 +01:00
9d1ace9aeb
Merge pull request #3949 from thaJeztah/fix_more_anchors
...
docs: fix some more anchors
2023-01-06 19:12:13 +01:00
81b051298e
docs: fix some more anchors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-06 18:45:32 +01:00
99023cb372
Merge pull request #3948 from thaJeztah/fix_anchor_links
...
docs: fix anchor links
2023-01-06 17:45:52 +01:00
71e561780a
docs: fix anchor links
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-06 17:29:40 +01:00
3613fcc864
docs: deprecated: fix link to Docker Desktop 3.2.0 release notes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-06 16:55:50 +01:00
e5b29b8975
Merge pull request #3943 from vvoland/fix-test-removeforce
...
cli/rm_test: Fix TestRemoveForce race condition
2023-01-06 15:39:39 +01:00
b811057181
cli/rm_test: Fix TestRemoveForce race condition
...
Synchronize append on the `removed` slice with mutex because
containerRemoveFunc is called in parallel for each removed container by
`container rm` cli command.
Also reduced the shared access area by separating the scopes of test
cases.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-01-04 10:57:45 +01:00
Akihiro Suda
Sebastiaan van Stijn
Bjorn Neergaard
craig-osterhout
Sebastiaan van Stijn
Ali Rostami
Yucheng Wu
CrazyMax
Paweł Gronowski