docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
14,428 Commits 12 Branches 295 Tags
ef8d6cbdf1deebd373200d23c9669c92b62ea8af
Commit Graph

927 Commits

Author SHA1 Message Date
moxiegirl
02c373c0f8 Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
Upstream-commit: fb1e10284bb04b29c21357675374fdd27a8ff3e4
Component: engine
 2015-04-03 12:33:22 -07:00
Tibor Vass
088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
 2015-04-02 08:25:49 -04:00
Sebastiaan van Stijn
0b52fe32d3 docs: fix bullet list and missing label filter 
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37c7f3a2046dc01c6c58ed64638faf136dd0682c
Component: engine
 2015-04-02 01:48:28 +02:00
Alexander Morozov
cd5f423b1f Bump API version and docs to v1.19 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
 2015-04-01 13:40:56 -07:00
Doug Davis
3e035d76a2 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
 2015-04-01 08:11:15 -07:00
Sebastiaan van Stijn
1394c160e0 Fix heading level of logging drivers 
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
 2015-04-01 01:07:22 +02:00
Phil Estes
bc620e0b67 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table 
Fix-11752 add capabilities list information table.
Upstream-commit: 97f621bcd84af39a92b5450a9450941651749944
Component: engine
 2015-03-30 23:18:30 -04:00
Harry Zhang
b39200ad98 Revison the some columns to make table clearer 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: bf15f675b9042db661de720900f367eff19737c0
Component: engine
 2015-03-31 02:41:49 +00:00
Michael Crosby
d7e9f5fdd9 Merge pull request #11799 from dqminh/aufs-dirperm1 
aufs: apply dirperm1 by default if supported
Upstream-commit: 14fed352cbb29232af1644e49e019da897a44de6
Component: engine
 2015-03-30 11:36:02 -07:00
Ankush Agarwal
5ba38993bc Explain --net=host option usage 
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
 2015-03-30 10:28:44 -07:00
moxiegirl
6b249811ef Merge pull request #11678 from botchagalupe/docker-11465 
Closes #11465 - Add additional doc for local registries on pull command
Upstream-commit: 41e47bbf34aa815fbc4fcec1247606b684bb9061
Component: engine
 2015-03-29 14:10:20 -07:00
Ankush Agarwal
a0e1171855 Add Glossary to documentation 
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 567f723721b7bac57a91d82d27472e568a101c4f
Component: engine
 2015-03-29 12:24:54 -07:00
Harry Zhang
3f29284d18 Remove dupllicated prefix to make table shorter & fix bugs 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 194cad243ccf622c8ff048975e26cc6c51ccbf30
Component: engine
 2015-03-28 01:49:28 +00:00
cheney90
61457ac29a Add capabilities list information table. 
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
Upstream-commit: 89a29d7e99e57bcbcf87a7657070bfdf59d7b6ad
Component: engine
 2015-03-27 08:45:36 +00:00
moxiegirl
1b99faf246 Merge pull request #11801 from hqhq/hq_fix_doc_for_exec 
update docs for container exec
Upstream-commit: 296642035df602a788c042ae09573f65cd29b200
Component: engine
 2015-03-26 15:31:16 -07:00
Mary Anthony
e5276fe0a7 Removing sudo from command line examples 
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
 2015-03-26 11:12:37 -07:00
Mary Anthony
d294d535e9 Removing sudo from examples 
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
 2015-03-26 10:13:19 -07:00
Daniel, Dao Quang Minh
0c673d5d15 document dirperm1 fix for #783 in known issues 
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: d7bbe2fcb5bf44f2fbcfa472e2a06c83d5d3aca1
Component: engine
 2015-03-26 07:46:13 +00:00
Qiang Huang
f182e61c8b update docs for container exec 
https://github.com/docker/docker/pull/11665 This PR changed container
exec API response, we need docs updated.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: fabb5114d808d127436121d28e320fd065f30865
Component: engine
 2015-03-26 13:55:46 +08:00
moxiegirl
0ee9f8042e Merge pull request #11776 from shin-/security_opt_docs_fix 
API docs fix for SecurityOpt parameter.
Upstream-commit: f84086be2a570f02cbde3a4bd018d535def964d4
Component: engine
 2015-03-25 18:20:59 -07:00
Joffrey F
fa879dbf22 SecurityOpt parameter is singular, and belongs in HostConfig 
since API 1.17

Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 61dba98608446f10b516a677753877cc3160173f
Component: engine
 2015-03-25 16:25:13 -07:00
Ankush Agarwal
12d1265301 Rename Fds to File Descriptors in docker info 
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 161c2e5e74e06b863b91d0f325faf083530ae1b8
Component: engine
 2015-03-25 12:04:15 -07:00
moxiegirl
8d4b28771e Merge pull request #11715 from duglin/DocCliEnvVars 
Add some info about what environment variables are available
Upstream-commit: dea660874ca3008af5c326a193ae5c657fefb30d
Component: engine
 2015-03-25 07:29:27 -07:00
moxiegirl
dc0bb844c3 Merge pull request #11694 from hqhq/hq_add_memsw_example 
docs: add memory and swap memory usage examples
Upstream-commit: 67eb10defe0617c3dbb563002474e8e85b97b7bb
Component: engine
 2015-03-25 07:01:44 -07:00
Doug Davis
9d47ebbe4f Add some info about what environment variables are available 
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0d2190e6794df81f3cf3b84707ce3abdf5843100
Component: engine
 2015-03-24 18:29:21 -07:00
Alexander Morozov
82a679e32d Merge pull request #11727 from tiborvass/carry-11441 
Carry 11441: fix docker ps help message
Upstream-commit: a4e1de58a3019e7ab9e143af3243713f0e80fe15
Component: engine
 2015-03-24 14:42:02 -07:00
jimmyxian
d83a675d7e fix docker ps help message 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Upstream-commit: a153e80f72274c05589145011c16cc1d7f8ee75f
Component: engine
 2015-03-24 15:33:53 -06:00
Qiang Huang
c7b0d94a4d add cpuset and examples to run.md 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a5cbb5c3aec0d5c717581b2b60b9ae89b2c6fd05
Component: engine
 2015-03-24 18:48:08 +08:00
Qiang Huang
5ae0277137 docs: add memory and swap memory usage examples 
fix: https://github.com/docker/docker/issues/11629

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0f9c20fe688e0bc093f631b7d31badc4bb750bd7
Component: engine
 2015-03-24 13:45:16 +08:00
John Willis
c0b33db0e0 #11465 Add additional doc for locagi registries onn pull command 
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: 3d28fc7d1c92456b226e1169bf3f44dcd9154b71
Component: engine
 2015-03-23 21:00:02 -04:00
Natalie Parker
05267b46bc Added missing code example in the RM command reference of command to delete all stopped containers 
Signed-off-by: Natalie Parker <nparker@omnifone.com>
Upstream-commit: fe1f5ac77cda335ee773956cc8683a0c31791c3c
Component: engine
 2015-03-23 23:05:57 +00:00
Alexander Morozov
dad3640059 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
 2015-03-23 11:34:33 -07:00
Tibor Vass
69bd180001 Merge pull request #10431 from duglin/Issue10391 
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
 2015-03-23 13:30:11 -05:00
Jessie Frazelle
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
 2015-03-22 19:16:23 -07:00
moxiegirl
d411e326ae Merge pull request #11505 from lloydde/doc-ref-run-it 
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
 2015-03-22 19:14:34 -07:00
Peter Waller
7c1bfa9093 Implement build cancellation 
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
 2015-03-22 11:31:28 +00:00
sidharthamani
a7d21898b0 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
 2015-03-21 18:01:18 -07:00
Doug Davis
490a18c994 Fix some escaping around env var processing 
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6d66e3e7a5ecb021a9e89c4f85fadecf23e2000c
Component: engine
 2015-03-20 20:09:00 -07:00
Todd Whiteman
e8bf8127c1 docs: cli: reorder rename command to be in alphabetical order 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: fe21c7a4bebd5d6d0065e0529d03a03723fc697b
Component: engine
 2015-03-20 14:51:39 -07:00
Jessie Frazelle
5e34656977 Merge pull request #11470 from albers/events-filter-name 
Remove 'name' filter from docker events documentation
Upstream-commit: f574262ff74126f080a7e9bd16f0e4017761de94
Component: engine
 2015-03-19 16:22:30 -07:00
Lloyd Dewolf
b2e6c9b566 doc: reference/run introduce -it . 
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
Upstream-commit: 6ca1494f1932b66e042263999d8afd90e184ebf8
Component: engine
 2015-03-19 13:59:40 -07:00
Harald Albers
07ba863c0f Remove 'name' filter from docker events documentation 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
 2015-03-19 08:51:36 +01:00
Vishnu Kannan
b21852214d Adding integration tests for --cgroup-parent feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
 2015-03-19 02:34:42 +00:00
Vishnu Kannan
8bcedc4b44 Adding documentation for '--cgroup-parent' option. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
 2015-03-19 02:34:15 +00:00
Doug Davis
793cdf14d1 Merge pull request #11410 from cpuguy83/10191_build_resources 
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
 2015-03-18 21:44:21 -04:00
Brian Goff
5e80a64076 Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
 2015-03-18 20:57:13 -04:00
Tibor Vass
47d9382364 Merge pull request #11430 from jfrazelle/export_outputflag 
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
 2015-03-18 19:04:43 -04:00
moxiegirl
ea8c209cf2 Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144 
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
 2015-03-18 08:46:52 -07:00
moxiegirl
d3fdbf9469 Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882 
Return of the Ring: Metadata Labels Doc Tweaks
Upstream-commit: 2ab105e9fe604bb709dfaf25a19f4af003a8ddad
Component: engine
 2015-03-17 09:47:36 -07:00
Arnaud Porterie
90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
 2015-03-17 09:45:58 -07:00