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,876 Commits 12 Branches 295 Tags
cf21a7328beba6ec70f5da660a36aecc1bb8fe32
Commit Graph

967 Commits

Author SHA1 Message Date
Mary Anthony
0e1a426ed8 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
 2015-04-15 19:02:01 -07:00
Brian Goff
ab74fc7837 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
Upstream-commit: f0c60f7085ea124c2d3660fae17c1d2ab7e4abb0
Component: engine
 2015-04-15 14:28:39 -04:00
moxiegirl
8f5db65c9f Merge pull request #12399 from emirozer/master 
closes #8945
Upstream-commit: 2499baefddb03e38b38a413a7290340a3f4b7420
Component: engine
 2015-04-15 10:53:10 -07:00
Emir Ozer
fc7bcaf7a1 closes #8945 
Signed-off-by: Emir Ozer <emirozer@yandex.com>
Upstream-commit: 960de9c8dd3d64dd4be0e851dd835e6d9427c70c
Component: engine
 2015-04-15 15:31:23 +02:00
Deng Guangxing
e04ea19d11 Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: acf025ad1b806fd9b5eb3358a8e1d75c6aae890d
Component: engine
 2015-04-15 11:51:24 +08:00
Qiang Huang
9f222f171d Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
 2015-04-15 09:34:12 +08:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
wonderflow
01cea82b52 fix memory stats display document 
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d791f7e9f81010299130ae8816ebe58667ea6b09
Component: engine
 2015-04-14 18:34:20 +08:00
David Calavera
b524d0385e Fix JSON format in the remote api configuration examples. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d71c929d081c2fb7c33b36ae5db40014163f9b6c
Component: engine
 2015-04-13 16:12:00 -07:00
Michael Crosby
6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
 2015-04-13 13:50:51 -07:00
Michael Crosby
483871b67f Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
 2015-04-13 13:32:45 -07:00
Bryan Boreham
426bfa8e61 Add a note about PID 1 not terminating on SIGINT/SIGTERM. 
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 5ad15479a0f3ce804a44a6931b716b0fae22ac6d
Component: engine
 2015-04-13 17:39:38 +01:00
James Turnbull
6fd02194d0 Merge pull request #12289 from sunyuan3/docker_remote_api 
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
 2015-04-11 09:27:36 -05:00
jianbosun
ca227f7854 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d6d8f45b04a6e6d0b616c85d1885342d3e676ec1
Component: engine
 2015-04-11 20:04:34 +08:00
Yuan Sun
dd126faafc update docker_remote_api_v1.* 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
 2015-04-11 18:11:49 +08:00
Lei Jitang
aaaa676179 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
 2015-04-11 11:26:37 +08:00
Lei Jitang
d1f2626097 Add -u|--user flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
 2015-04-11 11:04:24 +08:00
Deng Guangxing
d555f3e70e 'docker rmi -f IMAGE_ID' untag all names and delete the image 
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
 2015-04-11 09:24:21 +08:00
Tibor Vass
44fddcaf4b Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required 
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
 2015-04-10 16:52:38 -04:00
Vincent Batts
d89c51c3b5 devmapper: storage-opt override for udev sync 
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.

Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.

Including link to the docs for users that encounter this daemon error
during an upgrade.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
 2015-04-10 15:43:16 -04:00
moxiegirl
8c9e796ec1 Merge pull request #12218 from draghuram/apidoc_12055 
Adds example request and Json parameter information for container
Upstream-commit: 6ab4878a015cecfc26426a9a9704ea04ac04666e
Component: engine
 2015-04-10 11:22:57 -07:00
Arnaud Porterie
fdca34bdb1 Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword 
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
 2015-04-10 08:29:29 -07:00
Raghuram Devarakonda
41fc757124 Adds example request and Json parameter information for container 
start API.

Closes #10304.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 202e0380f36be93ace139cb52e6c4752d195a034
Component: engine
 2015-04-10 11:10:41 -04:00
Tibor Vass
5ed91523df Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
 2015-04-09 21:29:42 -04:00
David Young
3ee56a6e4d Refine document by review comments 
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: 8d682bf734539ade2d618349f82b8b5e83a87167
Component: engine
 2015-04-09 21:29:42 -04:00
David Young
807d6f107a Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
 2015-04-09 21:29:41 -04:00
Ahmet Alp Balkan
bc679a5419 cli: Better wording for daemon --log-driver 
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.

Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
 2015-04-09 02:12:44 -07:00
Ahmet Alp Balkan
a981a686fa docs: Markdown format fix around LogConfig param 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b66597eef18a02014e0b634dc3dc55dff3de4c20
Component: engine
 2015-04-08 16:16:37 -07:00
Yan Feng
c745cf0be5 Fix a typo in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
 2015-04-08 11:23:47 -04:00
Mary Anthony
27dad5da53 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 87e70b6831386775a0d6c6b952c947865f1d053b
Component: engine
 2015-04-07 14:09:53 -07:00
Yan Feng
cb57509d97 Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 805f34bb5b6f639b3eb361672af2cbc7437e2ce9
Component: engine
 2015-04-07 14:15:05 -04:00
moxiegirl
84e28d150d Merge pull request #12055 from l0kix2/patch-1 
Improved "start a container" section 1.16 & 1.17 API docs
Upstream-commit: ce18734c2cffebe112d06dca9117150ceaa08e15
Component: engine
 2015-04-06 11:41:38 -07:00
Arnaud Porterie
142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
 2015-04-06 11:11:31 -07:00
moxiegirl
07de27cc12 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS 
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
 2015-04-06 09:23:53 -07:00
Deng Guangxing
403c32d670 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 71de711189659847ea18313b7b0a57703960d0da
Component: engine
 2015-04-06 16:11:40 +08:00
Simei He
42748e46e4 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 5057d7da132c287d52749b6c73a9cd6129a1c05a
Component: engine
 2015-04-06 09:00:59 +08:00
Kirill SIbirev
828102e65e Improved "start a container" section in 1.16 & 1.17 docs 
It seems it was lost or something

Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
Upstream-commit: ac12c8053779d36409e248f41c4d80ef0e4fbe9f
Component: engine
 2015-04-04 11:23:49 +03:00
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
Simei He
c9d7b160f7 minor edits. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
 2015-04-03 14:43:21 +08: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
Deng Guangxing
5a7a97d2b6 docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
 2015-04-01 16:05:14 +08: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
dalanlan
55c259c94d fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8d3d34d5e310e6d3c80b4c3301b804a1edd25fb6
Component: engine
 2015-03-31 10:13:37 +08: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