Daniel Nephin
7c4d9074f1
Fix UseLine
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8e600e10f7
Component: cli
2017-10-25 18:22:04 -04:00
Brian Goff
a3b0929c08
Add note about reported memory stats on linux
...
Since the API and the CLI both have a "Usage" field for memory, clarify
that the CLI does additional calculations to avoid confusion of API
consumers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a6acacc533
Component: cli
2017-10-25 16:50:43 -04:00
Daniel Nephin
2e5b6e24c7
Update code for upstream cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4205416c9b
Component: cli
2017-10-25 14:49:26 -04:00
Sebastiaan van Stijn
4883b5d512
Merge pull request #638 from BastianHofmann/patch-1
...
Fix json formating in dockerd docs
Upstream-commit: 9b7656cc05
Component: cli
2017-10-25 10:56:21 +02:00
BastianHofmann
25caba7d97
Fix json formatting in dockerd docs
...
Fix another json formatiing error.
Signed-off-by: Bastian Hofmann <bastianhofmann@me.com >
Upstream-commit: c7867f5cc6
Component: cli
2017-10-25 08:50:34 +02:00
Sebastiaan van Stijn
835cb984a3
Mention known limitations for --squash
...
The experimental `docker build --squash` feature has a number
of limitations. For most use-cases, multi-stage builds are
a better alternative.
This patch lists the known limitations, and adds a link to
multi-stage builds.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bcc228ac6b
Component: cli
2017-10-24 14:32:06 +02:00
Misty Stanley-Jones
7b8e36ff5a
For system prune, -f is not an alias for --filter
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: d4e5481cd4
Component: cli
2017-10-20 10:51:28 -07:00
Misty Stanley-Jones
2ac0f85aa9
Update info on labels
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: e49e1ea739
Component: cli
2017-10-16 10:10:49 -07:00
John Mulhausen
210282a543
Removing titles from md files
...
Signed-off-by: John Mulhausen <john@docker.com >
Upstream-commit: 4a5db8d27e
Component: cli
2017-10-13 15:24:06 -07:00
Daniel Nephin
0f96be35a7
Add nakedret linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dbd96badb6
Component: cli
2017-10-12 11:48:51 -04:00
Sebastiaan van Stijn
107b0ea669
Merge pull request #611 from albers/completion-stack-deploy--resolve-image
...
Add bash completion for `stack deploy --resolve-image`
Upstream-commit: 6ef0ea82ea
Component: cli
2017-10-11 22:28:51 +02:00
Sebastiaan van Stijn
81908c29d1
Merge pull request #580 from djgoosen/patch-1
...
Update rmi.md
Upstream-commit: 0a6e1cb3aa
Component: cli
2017-10-11 22:17:46 +02:00
djgoosen
c5166635d0
Update rmi.md
...
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com >
Upstream-commit: 9004495541
Component: cli
2017-10-10 10:27:54 -07:00
Harald Albers
a808a78d53
Add bash completion for stack deploy --resolve-image
...
Also adds minimal documentation for this flag.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9559b9b7a8
Component: cli
2017-10-09 13:39:54 +02:00
Harald Albers
c50c8a6cf3
Update deprecation for synchronous service updates
...
- The default was not changed in 17.09 but will be in 17.10
- `service scale` and `service rollback` are also affected.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 20d9ceca78
Component: cli
2017-10-07 14:28:56 +02:00
Sebastiaan van Stijn
9d743bcb10
Merge pull request #598 from thaJeztah/fix-dockerd-heading-levels
...
Fix dockerd reference heading levels
Upstream-commit: 1649af8129
Component: cli
2017-10-06 01:51:19 +02:00
Sebastiaan van Stijn
6a849f46fd
Merge pull request #603 from thaJeztah/fix-service-create-markdown
...
Fix markdown link in service-create reference docs
Upstream-commit: 0f659d99bd
Component: cli
2017-10-05 21:49:29 +02:00
Misty Stanley-Jones
e55a2343f6
Merge pull request #547 from rdxmb/small-change
...
small reference change
Upstream-commit: 2801d382c6
Component: cli
2017-10-05 11:56:33 -07:00
Phil Estes
7cd305fd99
Add docs for Dockerfile ADD/COPY --chown flag
...
Document the new `--chown` flag added to the ADD and COPY commands in
the Dockerfile format.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: a83b9f102b
Component: cli
2017-10-05 12:35:01 -04:00
Sebastiaan van Stijn
afca8202d7
Fix markdown link in service-create reference docs
...
Markdown nested in a HTML table doesn't work, so changing
the link to a plain HTML link.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6b6511f191
Component: cli
2017-10-05 12:17:40 +02:00
Frieder Bluemle
ab0a17f568
Fix GitHub spelling
...
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com >
Upstream-commit: 45c9b9b6c1
Component: cli
2017-10-05 01:14:31 +08:00
Sebastiaan van Stijn
962e70214f
Fix dockerd reference heading levels
...
Commit ddadd3db49 changed
the heading levels of various sections, but as a result,
the "daemon configuration file" section (and other sections)
changed from a H2 to a H4, therefore no longer showing
up in the page's TOC / navigation bar.
This patch changes the heading level to a H3 for
sections that should show up in the page navigation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: aca0421eb8
Component: cli
2017-10-04 18:09:12 +02:00
Sebastiaan van Stijn
b4a6a3d358
Add --no-trunc option to docker container stats
...
This patch adds a `--no-trunc` option to `docker container stats`;
With this patch applied, the default output is:
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
b95a83497c91 awesome_brattain 0.28% 5.629MiB / 1.952GiB 0.28% 916B / 0B 147kB / 0B 9
67b2525d8ad1 foobar 0.00% 1.727MiB / 1.952GiB 0.09% 2.48kB / 0B 4.11MB / 0B 2
e5c383697914 test-1951.1.kay7x1lh1twk9c0oig50sd5tr 0.00% 196KiB / 1.952GiB 0.01% 71.2kB / 0B 770kB / 0B 1
4bda148efbc0 random.1.vnc8on831idyr42slu578u3cr 0.00% 1.672MiB / 1.952GiB 0.08% 110kB / 0B 578kB / 0B 2
84e3deaa45b2 registry 0.01% 3.402MiB / 1.952GiB 0.17% 127kB / 378B 233kB / 0B 10
2ed915778ceb foo.1.lsmxrefn5yp9c9ijz1hzgdq4u 0.00% 1.727MiB / 1.952GiB 0.09% 166kB / 7.76kB 614kB / 0B 2
Addin the `--no-trunc` option, changes the output to:
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
b95a83497c9161c9b444e3d70e1a9dfba0c1840d41720e146a95a08ebf938afc awesome_brattain 0.25% 5.75MiB / 1.952GiB 0.29% 648B / 0B 147kB / 0B 10
67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c foobar 0.00% 1.727MiB / 1.952GiB 0.09% 2.35kB / 0B 4.11MB / 0B 2
e5c383697914b98b10cbbc9d0bd324b7b927099ac584f031057b8208d2fba9b1 test-1951.1.kay7x1lh1twk9c0oig50sd5tr 0.00% 196KiB / 1.952GiB 0.01% 71.1kB / 0B 770kB / 0B 1
4bda148efbc006b0063373c3678083159af89f8cc83a6a28def14cb0dd171f70 random.1.vnc8on831idyr42slu578u3cr 0.00% 1.672MiB / 1.952GiB 0.08% 110kB / 0B 578kB / 0B 2
84e3deaa45b2fc363e06167df9b90ab59f88d4f101e3f9b8df03a62a8f6783e1 registry 0.00% 3.387MiB / 1.952GiB 0.17% 127kB / 378B 233kB / 0B 10
2ed915778cebddf9ec69263a75cfdcf00962a5198d94d42cda75d5cd45bb82f2 foo.1.lsmxrefn5yp9c9ijz1hzgdq4u 0.00% 1.727MiB / 1.952GiB 0.09% 166kB / 7.76kB 614kB / 0B 2
Which is the same as the default before this patch was applied.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e63417a9c0
Component: cli
2017-09-27 18:59:25 +02:00
Vincent Demeester
689b8ff233
Merge pull request #562 from dnephin/update-gometalinter
...
Update gometalinter
Upstream-commit: feb4d79935
Component: cli
2017-09-27 09:42:37 +02:00
Riyaz Faizullabhoy
bb1eca37a9
trust: remove extraneous OPTIONS from commands that do not use it
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 9ad0e8f223
Component: cli
2017-09-26 16:15:45 -07:00
Sebastiaan van Stijn
23c421f3c5
Merge pull request #557 from allencloud/add-more-event-filter-type
...
Add more event filters in doc: config, node, secret and service
Upstream-commit: 62d62ff513
Component: cli
2017-09-26 22:48:22 +02:00
Daniel Nephin
f321e1ed9d
Update gometalinter
...
The update includes bug fixes in gometalinter and updates to linters, which
discovered more linter problems.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d956386b2d
Component: cli
2017-09-26 12:33:35 -04:00
Allen Sun
86f10d67d5
add more event filters in doc: config, node, secret and service
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: fc98f8757a
Component: cli
2017-09-27 00:04:56 +08:00
Sebastiaan van Stijn
57dd97eab1
Merge pull request #555 from joaofnfernandes/docs/advertise-addr
...
Add note about joining through a load balancer
Upstream-commit: b77f3fd5ac
Component: cli
2017-09-26 17:15:42 +02:00
Sebastiaan van Stijn
9e59512fe4
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
Upstream-commit: be8dab26a3
Component: cli
2017-09-26 16:40:32 +02:00
Tycho Andersen
1fe51e0bb7
document the pass backend and default behavior
...
Also add a big warning about cleartext passwords.
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: a2f116733b
Component: cli
2017-09-26 08:31:02 -06:00
Joao Fernandes
025e41d2ae
Add note about joining through a load balancer
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 8595d15d60
Component: cli
2017-09-25 10:53:20 -07:00
Riyaz Faizullabhoy
702bac1553
mark command as experimental in docs and cli
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e07f345267
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
e0bca90fda
trust: rename inspect to view, add repo name to signer table header
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: c6db0cd7a1
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
e42a2df102
trust: address review feedback, refactor to align with existing cli/command semantics
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 45c102a03d
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
e92c4686dd
docs: update docker trust docs with correct tense and formatting
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 007aff70bf
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
97f2ec42fa
trust revoke: docs for docker trust revoke
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 43717a866e
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
ad5c7cb4bb
trust sign: docs for docker trust sign
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: bc665ed762
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
1115dc5cef
trust inspect: docs for docker trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 809ef0fd74
Component: cli
2017-09-25 09:34:53 -07:00
Allen Sun
a0ff43ff51
remove volume id because it only has name
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: fe1c1b6b5c
Component: cli
2017-09-23 11:26:56 +08:00
Marc Bihlmaier
120931ebc2
small reference change
...
Signed-off-by: Marc Bihlmaier <marc.bihlmaier@reddoxx.com >
Upstream-commit: 9490189cba
Component: cli
2017-09-22 10:49:30 +02:00
Sebastiaan van Stijn
6daf6c2b58
Fix service_create markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 01ef9acd31
Component: cli
2017-09-19 16:29:52 +02:00
Sebastiaan van Stijn
fab90b5b50
Merge pull request #524 from thaJeztah/update-deprecated-api-cors
...
Update deprecated.md for "api-enable-cors"
Upstream-commit: 139fcd3ee9
Component: cli
2017-09-18 21:37:08 +02:00
Daniel Nephin
50bc0b5a39
Merge pull request #523 from thaJeztah/more-yaml-information
...
Add more information to the generated YAML for documentation
Upstream-commit: 37ac97c72e
Component: cli
2017-09-18 13:12:39 -04:00
Sebastiaan van Stijn
9f902b9066
Merge pull request #526 from thaJeztah/docs-fix-system-prune
...
Update system prune docs for --volumes flag
Upstream-commit: d4251b4268
Component: cli
2017-09-18 19:10:46 +02:00
Sebastiaan van Stijn
eae91199bd
Remove .swp file that was accidentally added
...
This file was added by accident in dd95731a21
and not noticed during review.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e612236a3d
Component: cli
2017-09-15 13:20:40 +02:00
Sebastiaan van Stijn
b66e771f48
Merge pull request #534 from mion00/document_node_hostname_templating
...
Document .Node.Hostname templating
Upstream-commit: e2ee30ae42
Component: cli
2017-09-15 13:02:31 +02:00
Vincent Demeester
b43594fccc
Merge pull request #442 from jhowardmsft/jjh/34508docs
...
Docs for Windows daemon graphdriver options
Upstream-commit: 5a7f25f24c
Component: cli
2017-09-15 12:19:14 +02:00
Carlo Mion
a5b24016fd
Document .Node.Hostname templating
...
Update placeholders table and add example code
Follow up to moby/moby#34686
Signed-off-by: Carlo Mion <mion00@gmail.com >
Upstream-commit: 21825b6842
Component: cli
2017-09-15 10:23:56 +02:00
Sebastiaan van Stijn
150f7f6a55
Add more information about commands to generated YAML docs
...
This patch adds aditional information about commands to the YAML files
that are generated for the reference documentation.
The following fields are added for each command:
Property | Type | Description
------------------|-----------|---------------------------------------------------------------------------------------
deprecated | Boolean | Indicates if the command is marked deprecated
min_api_version | String | The API version required to use this command (e.g. "1.23")
experimental | Boolean | Indicates if the command requires the daemon to run with experimental features enabled
For example (taken from the experimental `docker checkpoint create` command):
command: docker checkpoint create
short: Create a checkpoint from a running container
long: Create a checkpoint from a running container
usage: docker checkpoint create [OPTIONS] CONTAINER CHECKPOINT
pname: docker checkpoint
plink: docker_checkpoint.yaml
options:
- option: checkpoint-dir
value_type: string
description: Use a custom checkpoint storage directory
deprecated: false
experimental: false
- option: leave-running
value_type: bool
default_value: "false"
description: Leave the container running after checkpoint
deprecated: false
experimental: false
deprecated: false
min_api_version: "1.25"
experimental: true
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1f48e75c5c
Component: cli
2017-09-14 00:48:22 +02:00