Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,928 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

1140 Commits

Author SHA1 Message Date
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
John Mulhausen 4a5db8d27e
Removing titles from md files 
Signed-off-by: John Mulhausen <john@docker.com>
 2017-10-13 15:24:06 -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
Phil Estes a83b9f102b
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>
 2017-10-05 12:35:01 -04: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
Christophe Vidal 037029414d Dropped hyphen in bind mount where appropriate 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
 2017-08-19 21:14:48 +07:00
Sebastiaan van Stijn 3c7ede6a68 Merge pull request #205 from redpanda/rollback 
Add 'docker service rollback' subcommand
 2017-08-19 15:56:14 +02:00
Sebastiaan van Stijn 9544b70cb3
Fix typo and minor Markdown edits 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-08-17 02:29:24 +02:00
Jimmy Leger 11d471d660 Add 'docker service rollback' subcommand 
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Implement runRollback to not use runUpdate

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Add version tag and add flag quiet to suppress progress output

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Removed flags from warnDetachDefault

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Used command.Cli interface

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Add detach flag on rollback command

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Create a fakeClient for service commands

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Added unit test for rollback command

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Used command.Cli interface instead of *command.DockerCli in service commands

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Revert "Removed flags from warnDetachDefault"

This reverts commit 3e4f601c8a82cc2599a755dc693409bbc47917fc.

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Fixed test.NewFakeCli instanciation

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Removed unused receiver

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Replaced cli by dockerCli

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Revert "Removed unused receiver"

This reverts commit 604ef7c13df3d019949ca81d992db501114dafce.

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Fixed last typo

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>
 2017-08-16 22:18:36 +02:00
Christophe Vidal 9c4b9c6f63 Updated & reformulated kinds of mounts section 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
 2017-08-17 00:51:35 +07:00
John Howard c848f9acb6 Docs for Windows daemon graphdriver options 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-15 10:20:15 -07:00
Vincent Demeester b8d325efd5 Merge pull request #432 from lukahartwig/docs-add-docker-events-examples 
Added docker events example with until option to documentation
 2017-08-14 10:57:46 +02:00
bryfry 6118658f73 Make the example match the documentation 
the missing `driver` made my bridge not have the correct MTU when i copied from the example and not the doc table.  Brings them into alignment.

Signed-off-by: bryfry <bryon@fryer.io>
 2017-08-11 21:47:34 -04:00
Luka Hartwig f959ac7fba Added docker events example with until option to documentation 
Signed-off-by: Luka Hartwig <mail@lukahartwig.de>
 2017-08-11 01:29:48 +02:00
Harald Albers 2dca576a4c Fix invalid plugin references in docs 
The plugins `tiborvass/sample-volume-plugins` and `tiborvass/no-remove`
do not exist.

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-08-07 11:15:39 +02:00
Kir Kolyshkin 9285db6752 Introduce/document new IPC modes 
This builds (and depends) on https://github.com/moby/moby/pull/34087

Version 2:
 - remove --ipc argument validation (it is now done by daemon)
 - add/document 'none' value
 - docs/reference/run.md: add a table with better modes description
 - dockerd(8) typesetting fixes

Version 3:
 - remove ipc mode tests from cli/command/container/opts_test.go

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-08-05 17:49:53 -07:00
Vincent Demeester b0cc841631 Merge pull request #405 from beenanner/patch-1 
Fix missing missing backtick in documentation for node ls
 2017-08-02 08:58:53 +02:00
Jonathan Lee 9e4ad4889e Fix missing missing backtick 
Signed-off-by: Jonathan Lee <jonjohn1232009@gmail.com>
 2017-08-01 20:45:43 -04:00
Vincent Demeester c6e497d15c Merge pull request #403 from Zebrilee/fix-issue-159 
update service create and update options in commandline documentation
 2017-08-01 14:08:29 +02:00
zebrilee 5fe09164f5 update service create and update options in commandline documentation 
Signed-off-by: zebrilee <zebrilee@gmail.com>
 2017-07-31 23:26:02 +02:00
Sebastiaan van Stijn f47d9803fd Merge pull request #399 from Zebrilee/fix-issue-253 
modify foo by container in order to clarify the documentation
 2017-07-31 10:40:08 -07:00
Sebastiaan van Stijn 7ac1db2f8f Merge pull request #393 from thaJeztah/add-missing-is-task-filter 
Docs: update filter options for docker container ps
 2017-07-31 09:51:13 +01:00
zebrilee 2d5f9d83e7 modify foo by container in order to clarify the documentation 
Signed-off-by: zebrilee <zebrilee@gmail.com>
 2017-07-29 20:44:50 +02:00
Kir Kolyshkin 6d85a4f5f8 Fix repo references in docs 
Since CLI was moved to a separate repo, these references are incorrect.
Fixed with the help of sed script, verified manually.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-07-28 10:32:42 -07:00
Sebastiaan van Stijn 46064f33f4
Docs: update filter options for docker container ps 
The `is-task` filter was only documented in the usage
section, but this section is not used in the documentation.

This patch adds the missing filter, synchronises the
man page source, and does some slight rephrasing
and reformatting of the filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-27 22:10:26 +02:00
Hernan Garcia f5bca7af10 fixed word network on volume_ls.md 
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
 2017-07-24 05:18:10 -05:00
Sebastiaan van Stijn 25ca529388 Merge pull request #223 from ripcurld0/docs_cp_prm 
Update the cp command docs to include archive
 2017-07-21 11:14:15 +02:00
Vincent Demeester 3d76febd17 Merge pull request #332 from tych0/docs-fixups-for-password-stdin 
Docs fixups for password stdin
 2017-07-20 11:31:23 +02:00
Tycho Andersen 3e392505a8 docs: add --password-stdin 
also add an example of usage

Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-07-18 15:25:46 -06:00
Sebastiaan van Stijn 03a46a66bd Merge pull request #331 from yuexiao-wang/docker-search-filters 
Fix filters displaying for docker search
 2017-07-14 23:30:43 -07:00
Sebastiaan van Stijn 47370b4863 Merge pull request #314 from allencloud/add-filter-scope-for-events 
docs: add filter scope for command events and more cluster events
 2017-07-14 23:28:55 -07:00
Sebastiaan van Stijn 5cc7ac2990 Service privileges: CLI reference docs & completion 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-14 22:30:47 -07:00
allencloud 8639c9baf8 docs: add filter scope for command events and more cluster events 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-07-15 09:17:35 +08:00
Daniel Nephin ad5d035988 More about ARG and build stages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-14 16:59:21 -04:00
Daniel Nephin 2880030814 Clarify docs about ARG in FROM 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-14 16:55:42 -04:00
Aleksa Sarai c7710819a5
docs: add documentation for dm.libdm_log_level 
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2017-07-14 16:52:33 +10:00
yuexiao-wang bd64ad25fb Fix filters displaying for docker search 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-07-14 08:56:20 +08:00
Valentin Lorentz 4f3a8aecad Fix typo (proceed -> precede) 
Signed-off-by: Valentin Lorentz <progval+git@progval.net>
 2017-07-07 13:17:15 +02:00
Victor Vieux 43fb4a4547 Merge pull request #243 from vieux/scale2 
add `--detach` to docker scale
 2017-07-04 16:36:59 +02:00
Vincent Demeester 357ff50fa9 Merge pull request #289 from mstanleyjones/multiple-env 
Provide examples for multiple uses of the same flag
 2017-07-04 12:48:20 +02:00
Misty Stanley-Jones c63485b47d Clarify that you can use -d and --rm together now 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-07-03 16:43:41 -07:00
Misty Stanley-Jones ef61582591 Provide examples for multiple uses of the same flag 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-07-03 16:21:28 -07:00
Sebastiaan van Stijn 29b419eed5
Some builder docs improvements 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-29 14:20:16 -07:00
Dhawal Yogesh Bhanushali ff2552f7a1 Adding docs for "overlay2.size" storage-opt 
Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
 2017-06-27 23:58:57 -07:00
Victor Vieux 6c6b1091d9 add --detach to docker scale 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-06-27 09:55:10 -07:00
Sebastiaan van Stijn 2eac0bb7b7 Merge pull request #230 from mstanleyjones/remove-userns-details 
Remove specific config info about userns-remap
 2017-06-26 21:11:53 -07:00
Sebastiaan van Stijn 8fc3179111 Merge pull request #225 from mstanleyjones/ps-markdown-formatting 
Reformat filtering options in ps ref
 2017-06-26 21:05:42 -07:00
Misty Stanley-Jones 11c1729e00 Fix false Liquid errors 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-06-26 12:50:34 -07:00
Misty Stanley-Jones 8222baf263 Remove specific config info about userns-remap 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-06-22 15:09:14 -07:00
Misty Stanley-Jones 0888df3058 Reformat filtering options in ps ref 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-06-21 10:31:03 -07:00
Vincent Demeester 4b1055aaa6 Merge pull request #222 from thaJeztah/carry-moby-33290 
Explain `stack deploy` with multiple Compose files
 2017-06-21 17:36:20 +02:00
Boaz Shuster e4c70d390d Update the cp command docs to include archive 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-06-21 13:20:47 +03:00
Vincent Demeester 9f00ec085f Merge pull request #164 from mstanleyjones/clarify-attach 
Clarify ability to attach multiple times
 2017-06-21 10:59:34 +02:00
Sebastiaan van Stijn 36fa4af30b
Explain `stack deploy` with multiple Compose files 
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.

Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-20 21:23:21 -07:00