0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27756 commits 14 branches 412 tags 338 MiB
Commit graph

1330 commits

Author SHA1 Message Date
Arnaud Porterie
6e85b81df2 Merge pull request #23614 from icecrime/inspect_services 
Allow `docker inspect` on all types
 2016-08-26 18:45:23 +00:00
Victor Vieux
63a19edcb1 add -f to plugin inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-25 22:40:05 -07:00
Yong Tang
5118dd2992 Update documentation for validation of --ip and ip6. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-25 22:11:56 -07:00
Doug Davis
91ec7fa811 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm 
Update docs for `docker create` to include `--rm` flag
 2016-08-26 09:06:30 -04:00
Antonio Murdaca
91fdafb79f Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged 
Fixes #25918 - Changed --permissive to --privileged.
 2016-08-26 12:06:58 +02:00
Vincent Demeester
48ff20c795 Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes 
Update docker remote api to mention restart policy validation
 2016-08-26 07:57:53 +02:00
Yong Tang
d7468cff4d Update docs for docker create to include --rm flag 
Since 20848 has been merged and both `docker create` and
`docker run` share the same `runconfig` parser, now both
`docker run` and `docker create` allow to specify the
`--rm` flag. However, docs for `docker create` has not
been udpated yet.

This fix updates docs for `docker create` so that `--rm`
flag has been included.

This fix is related to 20848 and 25577.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-25 22:05:38 -07:00
Victor Vieux
cf4e268115 replace active by enabled for consistency in plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-25 20:42:49 -07:00
Arnaud Porterie (icecrime)
3db9f7afce
Refactor docker inspect to work on all types 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-08-25 16:29:08 -07:00
Kara Alexandra
ba3f0bf0e7 Add option to specify name without --name in volume create 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
 2016-08-25 14:20:06 -07:00
Rich Moyse
b63ce3305c Fixes #25918 - Changed --permissive to --privileged. 
Signed-off-by: Rich Moyse <rich@moyse.us>
 2016-08-25 16:49:37 -04:00
Justin Cormack
efb9e38eba Begin process of deprecating MAINTAINER 
This may take some time, but start by pointing people at
LABEL instead.

MAINTAINER predates general LABEL and has basically no tooling,
only allows a single item to be added, and is has been
unofficially deprecated for some time, with many images not
including it, but we have never specifically said that it
should be replaced by LABEL as a better more generic metadata
solution.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-25 18:43:27 +01:00
Vincent Demeester
a011a94be7
Update docker remote api to mention restart policy validation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-25 17:03:18 +02:00
yuexiao-wang
530668cb22 Replace docker command from 'docker daemon' to 'dockerd' 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-25 17:04:44 +08:00
Aaron Lehmann
7cd88e5ec4 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager 
Remove option "--manager" description for swarm_join.md
 2016-08-22 13:13:21 -07:00
lixiaobing10051267
344d7f773d Remove option "--manager" description for swarm_join.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-22 15:42:38 +08:00
Vincent Demeester
daf454d8cd Merge pull request #25719 from eskaaren/master 
You can force leave swarm
 2016-08-22 09:15:37 +02:00
Vincent Demeester
c1bdda0be8 Merge pull request #25775 from ddgenome/entrypoint-env 
Remove erroneous ENTRYPOINT note
 2016-08-22 09:13:54 +02:00
Mihai Borobocea
441ecc459f docs: fix typo in url fragment 
I noticed the broken hyperlink in this page:
https://docs.docker.com/engine/reference/builder/
The link should point to `#parser-directives`.

Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
 2016-08-20 16:19:05 +03:00
Vincent Demeester
09b929083d Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion 
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
 2016-08-19 22:09:57 +02:00
Sebastiaan van Stijn
80798d28d3 Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken 
Modify usage of docker swarm join-token command
 2016-08-19 21:44:42 +02:00
lixiaobing10051267
9123ca546a Modify usage of docker swarm join-token command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-19 09:44:22 +08:00
Yong Tang
6c5c34d50d Add --force in docker volume rm to fix out-of-band volume driver deletion 
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).

This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.

Related documentations have been updated.

This fix is tested manually with flocker, as is specified in #23367.
An integration test has also been added for the scenario described.

This fix fixes #23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-18 18:01:25 -07:00
Vincent Demeester
426046db3a Merge pull request #25708 from timfeirg/master 
expose RemovalInProgress in StateString #25652
 2016-08-18 21:54:48 +02:00
Sebastiaan van Stijn
90308fd783 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave 
Specify woker node for docker swarm leave command
 2016-08-18 17:08:41 +02:00
timfeirg
37466cc8c8 expose RemovalInProgress in StateString #25652 
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
 2016-08-18 11:25:27 +08:00
yuexiao-wang
dd02815a26 clean up the run.md in reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-18 10:21:41 +08:00
lixiaobing10051267
fd660e21bf Specify woker node for docker swarm leave command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-18 09:35:11 +08:00
Justin Cormack
bf7a3f0104 Split list of capabilities into those added by default and those not 
The documentation was a bit unhelpful as to what are the default
capabilities, so split.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-17 21:16:54 +01:00
Michael Crosby
041e5a21dc Replace old oci specs import with runtime-specs 
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
a5ba032c74 Add missing docs about binary remote contexts 
This feature was added in docker 1.8, through
7491f9a9c1.

However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.

Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268d

This moves the API docs to the correct
versions, and restores the CLI documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 16:15:59 +02:00
David Dooling
20e336efac Make it clear who is doing variable expansion 
Add sentece to RUN, CMD, and ENTRYPOINT exec sections making it clear
that it is the shell doing the environment variable expansion.

Signed-off-by: David Dooling <dooling@gmail.com>
 2016-08-17 06:31:19 -05:00
Sebastiaan van Stijn
45cb33e65c Merge pull request #25704 from thaJeztah/cleanup-api-markdown 
Cleanup API docs Markdown formatting and wording
 2016-08-17 10:39:45 +02:00
David Dooling
f44d78b478 Remove erroneous ENTRYPOINT note 
The Dockerfile parser does not subsitute ENV variables in any form of
the ENTRYPOINT command.  Any substitution, if done, is done by the shell
when the command is executed.

Signed-off-by: David Dooling <dooling@gmail.com>
 2016-08-16 15:24:41 -05:00
David Dooling
28e01950a2 Update ENTRYPOINT/CMD table to agree with docs 
Several other places in the document it states that when using the shell
form of ENTRYPOINT, CMD and command line arguments are ignored.  That is
accurate, this table was not.  It is now.

Signed-off-by: David Dooling <dooling@gmail.com>
 2016-08-16 15:23:59 -05:00
Tõnis Tiigi
9a3e7d9e34 Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart 
Forbid update restart policy of container with AutoRemove flag
 2016-08-16 10:37:45 -07:00
Michael Crosby
0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332 
Add --no-trunc to service/node/stack ps output
 2016-08-16 09:25:45 -07:00
Sebastiaan van Stijn
641e1564cf Merge pull request #25757 from eskaaren/create_service_id 
Capital D in "ID" returned when creating service
 2016-08-16 17:01:22 +02:00
Vincent Demeester
e48aeb118c Merge pull request #25758 from eskaaren/create_service_annotations 
"Annotations" not a parameter
 2016-08-16 16:51:15 +02:00
Josh Horwitz
204c4d39d3 Add --no-trunc to service/node/stack ps output 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-08-16 10:19:11 -04:00
Eivin Giske Skaaren
69e481af4e "Annotations" not a parameter 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-08-16 15:17:26 +02:00
Sebastiaan van Stijn
dcdf2b404e Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs 
Add missing docs for volume ls filter=label
 2016-08-16 13:50:56 +02:00
Eivin Giske Skaaren
9eb2ec799e Capital D in "ID" returned when creating service 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-08-16 13:43:23 +02:00
Sebastiaan van Stijn
eb24e9bbd3 Cleanup API docs Markdown formatting and wording 
Synchronize formatting between versions, and
update wording to be consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-16 13:22:47 +02:00
Sebastiaan van Stijn
1f0a99e86f Merge pull request #25753 from eskaaren/swarm_inspect 
Add doc for inspect swarm
 2016-08-16 13:19:36 +02:00
Eivin Giske Skaaren
c59bc53727 Add doc for inspect swarm 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-08-16 12:49:33 +02:00
Zhang Wei
4754c64ab5 Forbid update restart policy of container with AutoRemove flag 
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-08-16 15:36:13 +08:00
Eivin Giske Skaaren
033482d9ff You can force leave swarm 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-08-16 09:32:45 +02:00
Akihiro Suda
dc38c9a047 add --format flag to docker info 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-08-16 04:03:52 +00:00
Sebastiaan van Stijn
9079d5ccbb Merge pull request #25706 from thaJeztah/add-authorization-header-to-api-docs 
Add X-Registry-Auth header to service API docs
 2016-08-15 21:54:06 +02:00