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
27,514 Commits 12 Branches 295 Tags
cc3c0d322a05b9daa67d9643c7a809eb4681e18b
Commit Graph

734 Commits

Author SHA1 Message Date
Tõnis Tiigi
cc3c0d322a Implement build cache based on history array 
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
 2016-09-23 11:30:06 -07:00
Sebastiaan van Stijn
89f68050aa Merge pull request #26850 from YuPengZTE/devDot 
Del the extra dot
Upstream-commit: a70e6dfe80c8b224b1df4510a3729c9a2c1d249e
Component: engine
 2016-09-23 10:10:11 +02:00
Vincent Demeester
69f06771c4 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes 
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
 2016-09-23 09:50:24 +02:00
YuPengZTE
d9ba2cf275 Del the extra dot 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 73770c00fc322929215108a44049e51f1d89cae5
Component: engine
 2016-09-23 15:22:52 +08:00
Sebastiaan van Stijn
ad119a9fca Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
 2016-09-22 02:07:53 +02:00
Misty Stanley-Jones
0eb9a616d1 Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 7b5c3d935a7a99b282f0f859101c887894a0b00e
Component: engine
 2016-09-21 13:05:33 -07:00
Vincent Demeester
2b811c42ec Merge pull request #25025 from cpuguy83/service_inspect_formatter 
Add formatter for service inspect
Upstream-commit: 00615efced8c8bd27c61ebd1dfc704bcf870cbaf
Component: engine
 2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
1504a332aa Merge pull request #26732 from yuexiao-wang/update-index 
Update on index reference documentation
Upstream-commit: 374ae5ce13a91dc7db74485aa99bfe9a361c4719
Component: engine
 2016-09-20 11:42:17 +02:00
yuexiao-wang
dadce77b75 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0483d776130aa6b7add845bdab3d1d8ee67f7480
Component: engine
 2016-09-20 16:37:52 +08:00
Vincent Demeester
37aff3fb80 Merge pull request #26482 from yuexiao-wang/add-option 
Update the options for docker client
Upstream-commit: a43691d645e085ad532fdd87a63e9143ba24420a
Component: engine
 2016-09-20 09:51:57 +02:00
Michael Crosby
8ee0f56810 Add init process for zombie fighting 
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
 2016-09-19 17:33:50 -07:00
Brian Goff
1b60c220e3 Add formatter for service inspect 
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 54ba82beab8ef8b71f5a6a2f7082ed7759b40df3
Component: engine
 2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
 2016-09-19 17:30:27 +02:00
Sebastiaan van Stijn
4d3a9b605f Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
 2016-09-19 13:57:39 +02:00
Misty Stanley-Jones
dd0606cd40 Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
 2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
e605090acb Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
 2016-09-19 11:56:59 +02:00
yuexiao-wang
c4eabb777e fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
 2016-09-18 11:00:19 +08:00
John Howard
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
6c1fbaf344 Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
 2016-09-17 03:32:23 +02:00
John Howard
7342ae40e2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
 2016-09-16 11:56:15 -07:00
Sebastiaan van Stijn
15e6354e7d 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>
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
 2016-09-16 17:22:58 +02:00
Sebastiaan van Stijn
6f7161dac7 Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
 2016-09-16 15:29:28 +02:00
Sebastiaan van Stijn
00c4e8a77c Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dddea689ab45ce146e6ac3a1199235e1f36ffe29
Component: engine
 2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
78d01f16b4 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>
Upstream-commit: edbb8fb86d7d0b715adc15415f0cb187433092a5
Component: engine
 2016-09-15 16:09:24 +02:00
Akihiro Suda
e6635a948e add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
 2016-09-15 09:55:29 +00:00
Anusha Ragunathan
470e277786 Merge pull request #26575 from anusha-ragunathan/update_plugin_docs 
Update plugin install docs with registry specifics.
Upstream-commit: e482d4ee71b00bb3ea1a71381cef9771b14eff6c
Component: engine
 2016-09-14 14:43:41 -07:00
Anusha Ragunathan
5ed47d0d43 Update plugin install docs with registry specifics. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 81d5abf33460264ad627e506a2563ec335faa131
Component: engine
 2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
b3b358d207 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
Upstream-commit: 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e
Component: engine
 2016-09-14 17:48:43 +02:00
lixiaobing10051267
849847f7b2 fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
 2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
422892f89b Merge pull request #25540 from estesp/ro-plus-userns 
Remove --read-only restriction when user ns enabled
Upstream-commit: 8ac2000f5065b887753ffe32d2b793bb4bbd84c5
Component: engine
 2016-09-14 13:53:58 +02:00
Vincent Demeester
9ac54a66eb Merge pull request #26489 from yuexiao-wang/update-exec 
update option for docker exec
Upstream-commit: 0c90f777b745263deb4be55250ac3d19ddd91cf2
Component: engine
 2016-09-13 11:16:22 +02:00
yuexiao-wang
4e9a7b27fc update option for docker commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
 2016-09-12 19:10:45 +08:00
yuexiao-wang
43008f4002 add option and update the description 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 1917d3b958da9ffc3b738941c783e9424e3c9c2e
Component: engine
 2016-09-12 16:08:59 +08:00
Yong Tang
70a2fe1d7b Fix documentation for Step 0 to Step 1 in docker build 
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
 2016-09-11 10:52:40 -07:00
Vincent Demeester
c47747e33c Merge pull request #26426 from sfsmithcha/carry_pry_25414 
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
 2016-09-10 11:50:28 +02:00
Charles Smith
0b9d5f508c carries and closes 25414 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
 2016-09-09 15:57:53 -07:00
allencloud
69668dcc9a support docker node ps multiNodes 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: af4461ad290d660acab5ef87b96e392263cc7cb9
Component: engine
 2016-09-10 02:52:48 +08:00
Phil Estes
c9069cbf6e Remove --read-only restriction when user ns enabled 
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6062ae5742e49ec1a79073c327f3d1343c218a12
Component: engine
 2016-09-09 13:23:41 -04:00
Richard Mathie
3ad3cbeebe Update service_create.md 
More info on endpoint setting, and service discovery on swarm mode overlay network.

Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk>
Upstream-commit: 21a9c64b77bd10969dde7376060d5750c6b65aac
Component: engine
 2016-09-08 12:11:48 -07:00
Michael Crosby
574f281ca0 Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
 2016-09-08 11:22:21 -07:00
Brian Goff
774225b30e Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
 2016-09-08 11:09:18 -04:00
lixiaobing10051267
8a3467d6a3 Labels info ommitted while inspecting self-defined network 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d5fcf57acbc9b77f0b38221d2eb0079be7169904
Component: engine
 2016-09-08 17:27:33 +08:00
Charles Smith
e42ce8aa21 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
 2016-09-07 10:38:59 -07:00
Daniel Nephin
a8af3835c4 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
 2016-09-07 11:31:11 -04:00
Sven Dowideit
64292ad8e2 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
Upstream-commit: e73e37f11206a346d2a552c5d133112cd103d562
Component: engine
 2016-09-07 22:18:26 +10:00
Michael Crosby
773fd0e328 Merge pull request #26212 from rhvgoyal/xfs-enospc 
devmapper: Set xfs max_retries to 0 upon ENOSPC
Upstream-commit: 0d03c060c7e6800e60833c4462b917ee9b081440
Component: engine
 2016-09-06 09:03:09 -07:00
Vincent Demeester
8226c5b8ed Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
Upstream-commit: da763602afbb25ea4428e1d608af5ee017a0b94e
Component: engine
 2016-09-06 17:47:46 +02:00
Yong Tang
c53f181a9b 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>
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
 2016-09-05 08:24:22 -07:00
Vincent Demeester
aabe996fb1 Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
 2016-09-05 09:52:18 +02:00
Akihiro Suda
c84cf3cf3a fix docs about sudo docker login 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d6007b4db0c2dc788fc0b1d2e2c5e95a5fa0701f
Component: engine
 2016-09-05 04:44:18 +00:00