p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,097 Commits 2 Branches 295 Tags
cd8273e40ca8602090ff4e7fe5de3a88bdad7e48
Commit Graph

303 Commits

Author SHA1 Message Date
Brian Goff
cd8273e40c Merge pull request #17127 from gesellix/docs-filters-query 
docs: fix description of `filters` param for /volumes and /networks.
Upstream-commit: 8005dbd748103357949e6ece5cad35fcb3f15018
Component: engine
 2015-10-19 09:49:37 -04:00
Sebastiaan van Stijn
650f9b7712 docs: fix storage driver options list 
This fixes the indentation of the storage driver
options list.

Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML

Fixes #17140

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8f36ded5b13b896d493645b845a24f4129b3a5de
Component: engine
 2015-10-17 19:17:07 -07:00
Tobias Gesellchen
ce075943c3 docs: fix description of filters param for /volumes and /networks. 
fixes #17091

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 3e064371e7ddec0de4dd2af75d5ac227b1080d53
Component: engine
 2015-10-17 00:24:40 +02:00
Vincent Demeester
943431b7fa Deprecate -c cli short variant flag in docker cli 
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
 2015-10-17 00:05:34 +02:00
Sebastiaan van Stijn
a120d9f127 Merge pull request #17085 from dnephin/add_digest_to_api_docs 
Correct API docs for /images/create
Upstream-commit: e2870bda43aef2e7649bf811b451d765ed16b4c4
Component: engine
 2015-10-16 10:10:41 -07:00
Mary Anthony
aa3a6d8798 bad d 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ee30af5ffb9b4db808c7e1e6db69c0c600e525c7
Component: engine
 2015-10-16 06:09:03 -07:00
Mary Anthony
8cbac2fa0e Removing extra tic 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e44876bf1fdb114a4730ef72f00e88c057abfb45
Component: engine
 2015-10-16 06:07:52 -07:00
Daniel Nephin
494b1b71ae Correct API docs for /images/create 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2ec4404ba039c6e6c40358cecd7d7ca16ee5b3e7
Component: engine
 2015-10-15 16:00:05 -04:00
David Calavera
2a30cdb717 Merge pull request #17057 from mavenugo/nls 
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
 2015-10-15 11:00:43 -07:00
Arnaud Porterie
46bdc83696 Merge pull request #16998 from vieux/engine_version 
only display 'Engine Version' when it's not empty
Upstream-commit: 9216b085363f4551ffe3b6cdba983eba3b945205
Component: engine
 2015-10-15 08:43:32 -07:00
Madhu Venugopal
7b66bab8fb Added network to docker --help and help cleanup 
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
 2015-10-15 03:10:39 -07:00
Victor Vieux
fbe671eb09 use Server Version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340
Component: engine
 2015-10-14 17:46:59 -07:00
Sebastiaan van Stijn
f672c8b33c Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc 
Improve the way we deliver Examples in command line.
Upstream-commit: 2b4128e904cf5ffc288e45dbc049de73a905e4e6
Component: engine
 2015-10-14 11:05:27 -07:00
Jian Zhang
556b9df83a Improve the way we deliver Examples in command line. (Add descriptive titles) 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
Upstream-commit: cc653b5d616ee8823c13b1b35ecf5f00e15463a8
Component: engine
 2015-10-14 11:04:51 +08:00
Tibor Vass
98858eadeb Bump API Version to v1.22 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
 2015-10-13 17:27:33 -07:00
Vincent Demeester
019ffb819f Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
 2015-10-13 23:16:10 +02:00
moxiegirl
517874fd19 Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634 
updating docs for EXPOSE option on run command
Upstream-commit: 9be87c9a96ba902214609bf486951a7dc171b82f
Component: engine
 2015-10-13 11:33:28 -07:00
moxiegirl
21b8dc752f Merge pull request #16946 from pwnall/cpu_quota_docs 
Document CFS CPU period / quota support in the API
Upstream-commit: 9ead1663c3c4e9841cd4fb9f8517e5a88cd3f0b6
Component: engine
 2015-10-13 10:51:48 -07:00
Mary Anthony
ba16a5cc21 Centralize discussion of behavior label and env. 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 39a71acf7e18c2d00d32b01db3daaebc7392d92a
Component: engine
 2015-10-13 09:44:17 -07:00
Sebastiaan van Stijn
d174ec9645 Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs 
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
Upstream-commit: 3856c5efa685013b5e82347d5812de4c7788d4ff
Component: engine
 2015-10-13 09:30:32 -07:00
Mike Brown
00116420f7 updating docs for EXPOSE option on run command; fixes #16634 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: d955fdb9ac279d5ea8e5fd20719eda579cca97ed
Component: engine
 2015-10-13 10:43:27 -05:00
Vincent Demeester
76cc1c235d Add docs for label/env log-opts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cd426ebed79e29153eb29ea1ccb260e15db2fea5
Component: engine
 2015-10-13 08:39:47 +02:00
Jess Frazelle
939faf2998 Merge pull request #16009 from azurezk/vol-create-conflict-option 
volume create error on conflict option
Upstream-commit: df79536769eab04a7f1c618f9a390b36be6c53be
Component: engine
 2015-10-12 15:27:36 -07:00
Sebastiaan van Stijn
8c9497957a Merge pull request #16942 from physicalit/master 
Add CMD and EXPOSE instruction example
Upstream-commit: dc500630ec0e6c69822bf6cd62a40ed6d029e2d3
Component: engine
 2015-10-12 15:26:30 -07:00
Victor Costan
ce2e2998fb Document CFS CPU period / quota support in the API. 
Docker 1.7 got support for specifying the CFS scheduler's CPU quota and
period. The work appears to have started around commit
dcc50e1d593fd7995189872791c6d7a013f16970. This change updates the API
documentation to reflect the existing support.

Signed-off-by: Victor Costan <costan@gmail.com>
Upstream-commit: 26bd356078a02313649c7562369a2b2de6b63e19
Component: engine
 2015-10-12 11:26:39 -04:00
Daniel Hiltgen
bed0f28df0 Document updates for cluster-store-opt 
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: ab83cf37c9df38e058938ef762aaefbc85f98f7d
Component: engine
 2015-10-12 08:05:02 -07:00
Mihuleacc Sergiu
88979b7a5e Add CMD and EXPOSE instruction example 
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com>
Upstream-commit: fad2cc6a18f28658b99be8f2951290b03ccbabf0
Component: engine
 2015-10-12 17:30:47 +03:00
Kun Zhang
6841b07f52 volume create error on conflict option 
Signed-off-by: Kun Zhang <zkazure@gmail.com>
Upstream-commit: 0ff3123eba071166def8072d8c7f3aa9afa0b56f
Component: engine
 2015-10-12 11:16:39 +08:00
Sebastiaan van Stijn
b34ed2cbab Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376 
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
 2015-10-11 15:35:04 -07:00
Sebastiaan van Stijn
7dfb385d48 Merge pull request #16764 from thaJeztah/follow-the-white-rabbit 
Docs: add Docker version/API version matrix
Upstream-commit: 70edf41c06719912e1d787f9f9e77705c81a0228
Component: engine
 2015-10-11 15:28:46 -07:00
Mary Anthony
6b6c7cc2b6 Enabled GitHub Flavored Markdown 
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
 2015-10-11 07:49:54 -07:00
Zhang Kun
9375e8c909 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
 2015-10-10 20:44:29 +08:00
Sven Dowideit
4e6b402919 Default the tcp port to 2376 if tls is on, and 2375 if not 
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
 2015-10-09 17:48:03 -07:00
Sebastiaan van Stijn
6d8620acc6 Merge pull request #16604 from mountkin/add-missing-commit-parameters 
add missing parameters of the commit API to the docs
Upstream-commit: dbc20693f7bc6ce9bc1da3f6c4c0cd725e0454c1
Component: engine
 2015-10-09 20:55:54 +02:00
moxiegirl
1863ad7ae9 Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes 
man update for docker run with host volumes
Upstream-commit: 26ee5fea02c7e7d09addc13275a0a44d2f608a4c
Component: engine
 2015-10-09 09:24:11 -07:00
Shijiang Wei
7318a696ed add missing parameters of the commit API to the docs 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: b69f4f3c1366385468e140613aedfc41038a4b35
Component: engine
 2015-10-09 23:21:12 +08:00
moxiegirl
ccb8fd3e79 Merge pull request #16876 from luca3m/patch-1 
Sync with remote API
Upstream-commit: 06146b333cb18dd3997e9c3632d79771ba79145c
Component: engine
 2015-10-09 06:30:02 -07:00
moxiegirl
c902cdd516 Merge pull request #16833 from sunyuan3/cpu-shares 
Add description for "--cpu-shares=0".
Upstream-commit: 734c9d2f67ada2dcc26a5a9b23f9fd5de0421c1f
Component: engine
 2015-10-09 06:29:18 -07:00
Luca Marturana
2a3da85fc7 Sync with remote API 
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Upstream-commit: d7ca0a48ac827c394f406787d1b28301da3c9a13
Component: engine
 2015-10-09 13:53:51 +02:00
Jess Frazelle
2c93131473 Merge pull request #16644 from dhiltgen/discovery_tls 
Add TLS support for discovery backend
Upstream-commit: b50a88cfd78498e5cd943ee3964585a73067e3e4
Component: engine
 2015-10-08 14:21:06 -07:00
moxiegirl
b07ff86773 Merge pull request #16837 from x1022as/network 
update dockernetwork.md and network api
Upstream-commit: 246072e8c5184c78edc9f40435987a7ba26baaa8
Component: engine
 2015-10-08 12:27:49 -07:00
Mary Anthony
92bcbdcb5f Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
 2015-10-08 09:28:46 -07:00
James Turnbull
6ff15cb8df Merge pull request #16828 from jwayong/jwayong/docs 
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
 2015-10-08 10:05:44 -04:00
moxiegirl
282a5880a8 Merge pull request #15265 from greaber/dockerignore-docs 
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
 2015-10-08 06:24:44 -07:00
Deng Guangxing
0012e76955 update dockernetwork.md and network api 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
 2015-10-08 15:34:24 +08:00
Yuan Sun
7fe62e2968 Add description for "--cpu-shares=0". 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b7249569e27e1962c69eef2b8f547fb6fb7ad367
Component: engine
 2015-10-08 10:50:55 +08:00
Daniel Hiltgen
47fa2052c1 Add TLS support for discovery backend 
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS.  Example usage:

    docker daemon [other args] \
        --cluster-advertise 192.168.122.168:2376 \
        --cluster-store etcd://192.168.122.168:2379 \
        --cluster-store-opt kv.cacertfile=/path/to/ca.pem \
        --cluster-store-opt kv.certfile=/path/to/cert.pem \
        --cluster-store-opt kv.keyfile=/path/to/key.pem

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 124792a8714425283226c599ee69cbeac2e4d650
Component: engine
 2015-10-07 16:01:00 -07:00
Januar Wayong
9c388a6249 Docs: Add docker-elements to remote API client lib doc page 
This closes #16824

Signed-off-by: Januar Wayong <januar@gmail.com>
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
 2015-10-08 08:45:35 +11:00
Grant Reaber
5e87c46dcd clarify dockerignore semantics 
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
 2015-10-07 15:51:57 -05:00
moxiegirl
780fae5a2c Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles 
Don't put dockerfiles in one continuous code block
Upstream-commit: 4c1540c8d2bb57123a4faa769d78cdf6202d4314
Component: engine
 2015-10-07 13:40:19 -07:00