0acfb79b17
Fixed misspelling
...
Signed-off-by: Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com >
Upstream-commit: c7d8561508
2017-11-17 11:27:49 -06:00
f9712fa620
Merge pull request #426 from simonferquel/service-isolation
...
--isolation for setting swarm service isolation mode
Upstream-commit: 5e2be6584a
2017-11-17 15:39:43 +01:00
c5471a4a0e
Add isolation mode on service update/create and compose files
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: 47cf2ea683
2017-11-17 15:31:13 +01:00
3be11a0388
Merge pull request #697 from squeegels/patch-1
...
Fixed typo under User section
Upstream-commit: d981bfa964
2017-11-17 09:31:06 +01:00
83579492a6
Fixed typo under User section
...
Signed-off-by: root <root@clientele.co.za >
Signed-off-by: Squeegels <lmscrewy@gmail.com >
Signed-off-by: Squeegels <1674195+squeegels@users.noreply.github.com >
Upstream-commit: 032f676717
2017-11-17 09:47:41 +02:00
f78101e94a
Add info about new port mapping syntax
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 9ef7caa6fe
2017-11-15 17:58:13 -08:00
cf38fd827e
Merge pull request #74 from jamiehannaford/until-logging
...
Add new CLI option for --until
Upstream-commit: 026c6db6f6
2017-11-14 18:49:46 +01:00
e9b472f2e1
Add docs
...
Signed-off-by: Jamie Hannaford <jamie@limetree.org >
Upstream-commit: 0450a2f437
2017-11-14 18:04:10 +01:00
66527d3a87
Adding note about creating Windows users
...
Signed-off-by: Patrick Lang <plang@microsoft.com >
Upstream-commit: cc35724c17
2017-11-13 11:43:38 -08:00
7cf0bd287e
Fix grammar
...
Signed-off-by: Mikhail Vasin <michaelvasin@gmail.com >
Upstream-commit: bdd1b1e279
2017-11-11 16:15:15 +03:00
d77f572b3a
Remove extra spaces from service creation examples
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 80211acee9
2017-11-10 10:14:56 -08:00
edb2c3c5b1
Merge pull request #575 from eiais/local-flag
...
trust sign: add --local flag
Upstream-commit: ee0615dc97
2017-11-07 14:15:53 -05:00
70aedb437f
fix a number of minor typos
...
Fix 19 typos, grammatical errors and duplicated words.
These fixes have minimal impact on the code as these are either in the
doc files or in comments inside the code files.
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com >
Upstream-commit: c3fe9d85ef
2017-10-31 15:21:51 +05:00
57801c5154
trust sign: add --local flag
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: f5a50650d6
2017-10-30 16:06:03 -07:00
7878df6b36
Merge pull request #655 from eiais/extraQuote
...
Remove extra quotes from docker trust sign
Upstream-commit: 65398de1a6
2017-10-30 13:53:18 -04:00
7b52a0b8c0
Merge pull request #648 from thaJeztah/fix-host-add-description
...
Fix flag description for --host-add
Upstream-commit: a79e742bfc
2017-10-30 13:52:29 -04:00
48cf1a4fab
Remove extra quotes from docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 291fdcfdbe
2017-10-30 10:31:21 -07:00
dd79157d92
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
Upstream-commit: 0c4fa699eb
2017-10-30 17:03:58 +01:00
2f9ed9f2a3
review feedback: updating for windows, error paths
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e189a21a25
2017-10-30 16:55:59 +01:00
506e33cdf2
trust: move signer and key commands down one level
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 532d223db4
2017-10-30 16:53:54 +01:00
222f56b982
docs: add docs for new trust subcommands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e797eaa04
2017-10-30 16:53:54 +01:00
88e8779c7d
Merge pull request #623 from johndmulhausen/master
...
Removing titles from md files
Upstream-commit: 92afc3f474
2017-10-30 14:01:58 +01:00
772cdcbf0c
Fix flag description for --host-add
...
The `--host-add` flag adds a new `host:ip` mapping. Even though
adding an entry is idempotent (adding the same mapping multiple
times does not update the service's definition), it does not
_update_ an existing mapping with a new IP-address (multiple
IP-addresses can be defined for a host).
This patch removes the "or update" part from the flag's
description.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 79b19cba16
2017-10-28 16:47:53 +02:00
e0db409186
Adds unpause output to docs
...
Signed-off-by: Jesse Adametz <jesseadametz@gmail.com >
Upstream-commit: 8bf99be0c7
2017-10-26 23:55:03 -07:00
2613cd4235
Merge pull request #644 from thaJeztah/fix-daemon-config-example
...
Fix daemon.json runtime example
Upstream-commit: 41797e1753
2017-10-26 09:31:57 +02:00
5c9abffbcf
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 >
Upstream-commit: 1e5d013064
2017-10-26 02:15:49 +02:00
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
2017-10-25 16:50:43 -04:00
4883b5d512
Merge pull request #638 from BastianHofmann/patch-1
...
Fix json formating in dockerd docs
Upstream-commit: 9b7656cc05
2017-10-25 10:56:21 +02:00
25caba7d97
Fix json formatting in dockerd docs
...
Fix another json formatiing error.
Signed-off-by: Bastian Hofmann <bastianhofmann@me.com >
Upstream-commit: c7867f5cc6
2017-10-25 08:50:34 +02:00
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
2017-10-24 14:32:06 +02:00
7b8e36ff5a
For system prune, -f is not an alias for --filter
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: d4e5481cd4
2017-10-20 10:51:28 -07:00
2ac0f85aa9
Update info on labels
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: e49e1ea739
2017-10-16 10:10:49 -07:00
210282a543
Removing titles from md files
...
Signed-off-by: John Mulhausen <john@docker.com >
Upstream-commit: 4a5db8d27e
2017-10-13 15:24:06 -07:00
107b0ea669
Merge pull request #611 from albers/completion-stack-deploy--resolve-image
...
Add bash completion for `stack deploy --resolve-image`
Upstream-commit: 6ef0ea82ea
2017-10-11 22:28:51 +02:00
81908c29d1
Merge pull request #580 from djgoosen/patch-1
...
Update rmi.md
Upstream-commit: 0a6e1cb3aa
2017-10-11 22:17:46 +02:00
c5166635d0
Update rmi.md
...
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com >
Upstream-commit: 9004495541
2017-10-10 10:27:54 -07:00
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
2017-10-09 13:39:54 +02:00
9d743bcb10
Merge pull request #598 from thaJeztah/fix-dockerd-heading-levels
...
Fix dockerd reference heading levels
Upstream-commit: 1649af8129
2017-10-06 01:51:19 +02:00
6a849f46fd
Merge pull request #603 from thaJeztah/fix-service-create-markdown
...
Fix markdown link in service-create reference docs
Upstream-commit: 0f659d99bd
2017-10-05 21:49:29 +02:00
e55a2343f6
Merge pull request #547 from rdxmb/small-change
...
small reference change
Upstream-commit: 2801d382c6
2017-10-05 11:56:33 -07:00
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
2017-10-05 12:17:40 +02:00
ab0a17f568
Fix GitHub spelling
...
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com >
Upstream-commit: 45c9b9b6c1
2017-10-05 01:14:31 +08:00
962e70214f
Fix dockerd reference heading levels
...
Commit ddadd3db49github@gone.nl >
Upstream-commit: aca0421eb8
2017-10-04 18:09:12 +02:00
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
2017-09-27 18:59:25 +02:00
bb1eca37a9
trust: remove extraneous OPTIONS from commands that do not use it
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 9ad0e8f223
2017-09-26 16:15:45 -07:00
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
2017-09-26 22:48:22 +02:00
86f10d67d5
add more event filters in doc: config, node, secret and service
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: fc98f8757a
2017-09-27 00:04:56 +08:00
57dd97eab1
Merge pull request #555 from joaofnfernandes/docs/advertise-addr
...
Add note about joining through a load balancer
Upstream-commit: b77f3fd5ac
2017-09-26 17:15:42 +02:00
9e59512fe4
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
Upstream-commit: be8dab26a3
2017-09-26 16:40:32 +02:00
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
2017-09-26 08:31:02 -06:00
