dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-10 01:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,918 Commits 19 Branches 592 Tags
bbe7ec7a0a06fb24d98d38cdd208ec71d2ff8767
Commit Graph

611 Commits

Author SHA1 Message Date
GuyTempleton
1d7418f212 Add missing quote mark and fix grammar in inspect docs 
Signed-off-by: GuyTempleton <Guy.Templeton@skyscanner.net>
 2016-11-21 09:10:28 +00:00
Misty Stanley-Jones
cf60af87f9 Formatting changes to make 1.12.x ref docs buildable in Jekyll 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-09 13:07:24 -08:00
Misty Stanley-Jones
68aca71637 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d76)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:07 +02:00
Sebastiaan van Stijn
ca474f7808 Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:52 +02:00
yuexiao-wang
d4288a3212 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0483d77613)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:34 +02:00
Sebastiaan van Stijn
7da3e5d0b2 Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 533b00da8b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:59 +02:00
yuexiao-wang
5508a82cac fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0f0b0db842)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:45 +02:00
Misty Stanley-Jones
0e29518469 Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
(cherry picked from commit 5880d62953)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:28 +02:00
Sebastiaan van Stijn
3bd4612aaf Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit eb3a01eb43)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:25:31 +02:00
Alessandro Boch
e289fc155a Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e74a937b00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:46 +02:00
Sebastiaan van Stijn
c84d8b8360 Use "sudo" for dockerd examples 
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 87b174080b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:23:30 +02:00
Sebastiaan van Stijn
ae9b46dbd0 Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7ca02f86de)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:53 +02:00
Sebastiaan van Stijn
a8aaf5bfad Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dddea689ab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:37 +02:00
Sebastiaan van Stijn
c6ba6498b3 Restore missing "format" example 
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit edbb8fb86d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:17:29 +02:00
Victor Vieux
1ec9ca1ca6 Merge pull request #26866 from docker/cherry-picks-1.12.2 
Cherry picks 1.12.2
 2016-09-27 13:33:29 -07:00
Sebastiaan van Stijn
e9c655442a 1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm" 
This reverts commit 44180a48e9,
as `docker create --rm` is part of docker 1.13, so should
not be in the 1.12 branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-27 16:33:53 +02:00
Yong Tang
e892a54fa1 Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit b9e46235fa)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-26 19:33:52 -07:00
Misty Stanley-Jones
24df982128 Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 7b5c3d935a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-26 19:33:45 -07:00
Sebastiaan van Stijn
99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:13 -07:00
Brian Goff
9ec857ad5a Merge pull request #26472 from yongtang/09112016-docker-build-step-0 
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Vincent Demeester
0183b3bf8c Merge pull request #26426 from sfsmithcha/carry_pry_25414 
Carry pr 25414
(cherry picked from commit e6f76800f5)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Michael Crosby
b23bff1d9f Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
(cherry picked from commit 061cc41759)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:12 -07:00
Misty Stanley-Jones
bf637439e7 Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option" 
This reverts commit eea99cd001.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-12 11:02:09 -07:00
Vincent Demeester
eea99cd001 Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:58 -07:00
Brian Goff
8a56561528 Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:37 -07:00
Charles Smith
dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:29 -07:00
Sven Dowideit
be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates 
2016.09.08 engine docs updates
 2016-09-09 21:43:38 +10:00
Sven Dowideit
bf7d335513 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f112)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-08 14:34:00 -07:00
Vincent Demeester
11330bf048 Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
(cherry picked from commit da763602af)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:31:59 -07:00
Vincent Demeester
95bc4519d2 Merge pull request #26241 from YuPengZTE/devNote 
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:28:39 -07:00
Vincent Demeester
a42e2a0e42 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect 
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:18:44 -07:00
Vincent Demeester
1e9fb2f18e Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate 
provide actual command format for docker network create
(cherry picked from commit 37fd1416da)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:17:10 -07:00
Vincent Demeester
748f3ef8e3 Merge pull request #26185 from yuexiao-wang/update-docs 
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a9)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:11:34 -07:00
Sven Dowideit
5c34d579dc Merge pull request #26302 from vdemeester/health_status-in-event-docs 
Add health status as action on events documentations
(cherry picked from commit b468df9eac)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:04:23 -07:00
Vincent Demeester
7e2259bb63 Merge pull request #26271 from AkihiroSuda/fix-service-create-doc 
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e1)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:03:07 -07:00
Justin Cormack
9bef12dcfd Merge pull request #26096 from ohmystack/fix/docs-dockerd 
Add docs for "--containerd" in dockerd
(cherry picked from commit 644cb53b41)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:31:55 -07:00
Doug Davis
44180a48e9 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm 
Update docs for `docker create` to include `--rm` flag
(cherry picked from commit 91ec7fa811)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:29:55 -07:00
Vincent Demeester
af9378f713 Merge pull request #25996 from yuexiao-wang/fix-docker-daemon 
Replace docker command from 'docker daemon' to 'dockerd'
(cherry picked from commit aff33055ac)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:06:57 -07:00
Aaron Lehmann
72f1556f62 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager 
Remove option "--manager" description for swarm_join.md
(cherry picked from commit 7cd88e5ec4)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:03:16 -07:00
Sebastiaan van Stijn
e097320c92 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave 
Specify woker node for docker swarm leave command
(cherry picked from commit 90308fd783)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-26 16:04:20 -07:00
Sebastiaan van Stijn
21e168053f Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context 
Add missing docs about binary remote contexts
(cherry picked from commit b4abe38d43)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-26 15:44:11 -07:00
Sebastiaan van Stijn
2875711fe7 Restore missing ps example for killed containers 
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8d5818a693)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
David Lechner
a30a0b07a4 Move export from image commands to container commands 
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
(cherry picked from commit 43c8cc7bb4)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
Charles Smith
3da4ac64af add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
Tibor Vass
5680192346 Merge pull request #25632 from SvenDowideit/more-docs-1.12.1-cherry-picks 
More docs 1.12.1 cherry picks
 2016-08-12 00:14:30 -07:00
Tibor Vass
5dc0715cd2 Merge pull request #25637 from tiborvass/cherry-picks-1.12.1 
Cherry picks 1.12.1
 2016-08-11 22:27:32 -07:00
Tibor Vass
9623f45fce Remove --network-add and --network-rm flags from service update 
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3a7e90c743)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 19:37:41 -07:00
Diogo Monica
caaf53ad3e Add --force to node removal 
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
(cherry picked from commit a327c231b5)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:45 -07:00
Sebastiaan van Stijn
40baa97ab1 Improve swarm join-token instructions 
this change improves the instructions for
swarm join-token and swarm init;

- only print the join-token command for workers
  instead of for both managers and workers, to
  prevent users from copying the wrong command.
  An extra line is added to explain how to obtain
  the manager token.
- print a message that a token was rotated
  sucesfully if '--rotate' is used.
- add some extra white-space before / after
  the join commands, to make copy/pasting
  easier.

this change also does some refactoring of join-token;

- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
  to prevent checking for them multiple times, and to
  keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
  this makes it easier to copy, and cleans up the
  code a tiny bit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ebebd41769)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:45 -07:00
allencloud
e25a1ca19c update command description in CLI 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 6c5988ed8c)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:44 -07:00