Sebastiaan van Stijn
41797e1753
Merge pull request #644 from thaJeztah/fix-daemon-config-example
...
Fix daemon.json runtime example
2017-10-26 09:31:57 +02:00
Sebastiaan van Stijn
1e5d013064
Fix daemon.json runtime example
...
The example in the documentation used "runc", which is a
reserved runtime name (as it's the default).
This patch updates the example, and uses a different name.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-26 02:15:49 +02:00
Brian Goff
a6acacc533
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>
2017-10-25 16:50:43 -04:00
Sebastiaan van Stijn
9b7656cc05
Merge pull request #638 from BastianHofmann/patch-1
...
Fix json formating in dockerd docs
2017-10-25 10:56:21 +02:00
BastianHofmann
c7867f5cc6
Fix json formatting in dockerd docs
...
Fix another json formatiing error.
Signed-off-by: Bastian Hofmann <bastianhofmann@me.com>
2017-10-25 08:50:34 +02:00
Sebastiaan van Stijn
bcc228ac6b
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>
2017-10-24 14:32:06 +02:00
Misty Stanley-Jones
d4e5481cd4
For system prune, -f is not an alias for --filter
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-10-20 10:51:28 -07:00
Misty Stanley-Jones
e49e1ea739
Update info on labels
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-10-16 10:10:49 -07:00
Sebastiaan van Stijn
6ef0ea82ea
Merge pull request #611 from albers/completion-stack-deploy--resolve-image
...
Add bash completion for `stack deploy --resolve-image`
2017-10-11 22:28:51 +02:00
Sebastiaan van Stijn
0a6e1cb3aa
Merge pull request #580 from djgoosen/patch-1
...
Update rmi.md
2017-10-11 22:17:46 +02:00
djgoosen
9004495541
Update rmi.md
...
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com>
2017-10-10 10:27:54 -07:00
Harald Albers
9559b9b7a8
Add bash completion for `stack deploy --resolve-image`
...
Also adds minimal documentation for this flag.
Signed-off-by: Harald Albers <github@albersweb.de>
2017-10-09 13:39:54 +02:00
Sebastiaan van Stijn
1649af8129
Merge pull request #598 from thaJeztah/fix-dockerd-heading-levels
...
Fix dockerd reference heading levels
2017-10-06 01:51:19 +02:00
Sebastiaan van Stijn
0f659d99bd
Merge pull request #603 from thaJeztah/fix-service-create-markdown
...
Fix markdown link in service-create reference docs
2017-10-05 21:49:29 +02:00
Misty Stanley-Jones
2801d382c6
Merge pull request #547 from rdxmb/small-change
...
small reference change
2017-10-05 11:56:33 -07:00
Sebastiaan van Stijn
6b6511f191
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>
2017-10-05 12:17:40 +02:00
Frieder Bluemle
45c9b9b6c1
Fix GitHub spelling
...
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com>
2017-10-05 01:14:31 +08:00
Sebastiaan van Stijn
aca0421eb8
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>
2017-10-04 18:09:12 +02:00
Sebastiaan van Stijn
e63417a9c0
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>
2017-09-27 18:59:25 +02:00
Riyaz Faizullabhoy
9ad0e8f223
trust: remove extraneous OPTIONS from commands that do not use it
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-26 16:15:45 -07:00
Sebastiaan van Stijn
62d62ff513
Merge pull request #557 from allencloud/add-more-event-filter-type
...
Add more event filters in doc: config, node, secret and service
2017-09-26 22:48:22 +02:00
Allen Sun
fc98f8757a
add more event filters in doc: config, node, secret and service
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-27 00:04:56 +08:00
Sebastiaan van Stijn
b77f3fd5ac
Merge pull request #555 from joaofnfernandes/docs/advertise-addr
...
Add note about joining through a load balancer
2017-09-26 17:15:42 +02:00
Sebastiaan van Stijn
be8dab26a3
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
2017-09-26 16:40:32 +02:00
Tycho Andersen
a2f116733b
document the pass backend and default behavior
...
Also add a big warning about cleartext passwords.
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-26 08:31:02 -06:00
Joao Fernandes
8595d15d60
Add note about joining through a load balancer
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2017-09-25 10:53:20 -07:00
Riyaz Faizullabhoy
e07f345267
mark command as experimental in docs and cli
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
c6db0cd7a1
trust: rename inspect to view, add repo name to signer table header
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
45c102a03d
trust: address review feedback, refactor to align with existing cli/command semantics
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
007aff70bf
docs: update docker trust docs with correct tense and formatting
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
43717a866e
trust revoke: docs for docker trust revoke
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
bc665ed762
trust sign: docs for docker trust sign
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
809ef0fd74
trust inspect: docs for docker trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
Allen Sun
fe1c1b6b5c
remove volume id because it only has name
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-23 11:26:56 +08:00
Marc Bihlmaier
9490189cba
small reference change
...
Signed-off-by: Marc Bihlmaier <marc.bihlmaier@reddoxx.com>
2017-09-22 10:49:30 +02:00
Sebastiaan van Stijn
01ef9acd31
Fix service_create markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-19 16:29:52 +02:00
Sebastiaan van Stijn
d4251b4268
Merge pull request #526 from thaJeztah/docs-fix-system-prune
...
Update system prune docs for --volumes flag
2017-09-18 19:10:46 +02:00
Sebastiaan van Stijn
e612236a3d
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>
2017-09-15 13:20:40 +02:00
Sebastiaan van Stijn
e2ee30ae42
Merge pull request #534 from mion00/document_node_hostname_templating
...
Document .Node.Hostname templating
2017-09-15 13:02:31 +02:00
Vincent Demeester
5a7f25f24c
Merge pull request #442 from jhowardmsft/jjh/34508docs
...
Docs for Windows daemon graphdriver options
2017-09-15 12:19:14 +02:00
Carlo Mion
21825b6842
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>
2017-09-15 10:23:56 +02:00
Sebastiaan van Stijn
b4db84de69
Update system prune docs for --volumes flag
...
The `--volumes` flag was added in 37fd6128dc
,
but the documentation was not updated.
This patch updates the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-14 00:42:12 +02:00
Tobias Gesellchen
f8ed8d22c6
[docs] Fix typo in configration.
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2017-09-10 23:12:29 +02:00
Vincent Demeester
21b5bbe411
Merge pull request #454 from mstanleyjones/resource-updating-windows
...
docker update does not work on Windows containers
2017-08-25 19:57:12 +02:00
Misty Stanley-Jones
047d3c23a7
docker update does not work on Windows containers
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-08-25 10:35:28 -07:00
Vincent Demeester
8ebc03a71f
Merge pull request #367 from kolyshkin/ipcmode
...
Introduce/document new IPC modes
2017-08-25 09:48:00 +02:00
Rubens Figueiredo
dd95731a21
Added docker documentation for Expose
...
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com>
2017-08-23 16:12:46 -07:00
Daniel Nephin
05308fcec7
Merge pull request #440 from ripcurld0/search_format
...
Add --format to docker-search
2017-08-22 19:10:53 -04:00
Boaz Shuster
88cc47ad5c
Add --format to docker-search
...
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-08-23 01:37:54 +03:00
Marco Mariani
3a0b967c05
support --compose-file - as stdin
...
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr>
2017-08-22 17:55:59 +02:00