1
0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Commit Graph

25697 Commits

Author SHA1 Message Date
Brian Goff
9ee86916b6 Merge pull request #26738 from thaJeztah/remove-unused-state-functions
Removed unused state functions
Upstream-commit: 1dded94b1b687167fd479db342bdcb9069297692
Component: engine
2016-09-20 09:16:30 -04:00
Brian Goff
3e855af466 Merge pull request #26741 from thaJeztah/fix-api-docs
Fix incorrectly named API options
Upstream-commit: 5fa94084ac049d455603565f517ada00117bc4d4
Component: engine
2016-09-20 09:14:08 -04: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
a262e6d191 Fix incorrectly named API options
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 36a25bdbe4d973aef308fa11b450264dae1bc0b4
Component: engine
2016-09-20 13:51:55 +02:00
Sebastiaan van Stijn
b99f52832d Removed unused state functions
This removes the SetStoppedLocking, and
SetRestartingLocking functions, which
were not used anywhere.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a28c389da109808c5b39da02fdfd24b9e36137fe
Component: engine
2016-09-20 13:09:18 +02:00
Vincent Demeester
1de29e4a8e Merge pull request #26727 from Microsoft/jjh/breakcontinue
Oops, break should have been continue
Upstream-commit: fe0d7e0799f20af220f7da18d17c26cd6ec871b7
Component: engine
2016-09-20 11:43:27 +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
Antonio Murdaca
4cd6f89f27 Revert "Add default timeout to pkg/plugins/client"
This reverts commit 0699b00d26a60f4a8447572b34c4aad1ce73d2e1.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5c35bfed3f4823e205c5d5b171f23972ff8b3de0
Component: engine
2016-09-20 10:01:03 +02: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
Daniel Nephin
51750bf53a Merge pull request #26717 from dnephin/fix_experimental_commands
Make all the experimental subcommand consistent
Upstream-commit: d8c9951707b1a893518888e04ac1bfd80e26f19d
Component: engine
2016-09-19 19:29:48 -04:00
Michael Crosby
5f83c7f680 Merge pull request #26442 from vieux/add_warning_plugin_rm
add check plugin is not used before rm
Upstream-commit: 69114bb3a759d74baa1f6809d3e4610c69b8be07
Component: engine
2016-09-19 16:03:17 -07:00
John Howard
7330d7eef7 Oops, break should have been continue
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bbbc720620befd1ba6f1ff9b0ac69a590bdac68e
Component: engine
2016-09-19 14:41:27 -07:00
Sebastiaan van Stijn
62c8ac5cdc Merge pull request #26579 from Microsoft/jjh/ociprocess
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02: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
Daniel Nephin
cca442f52e Make all the experimental subcommand consistent.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6eefcea51a85d202fcb1e282c6c74b4553743107
Component: engine
2016-09-19 16:27:23 -04:00
Sebastiaan van Stijn
0afc2f6a90 Merge pull request #26025 from dnephin/cli-new-command-structure
Restructure CLI Commands
Upstream-commit: ad9ceff3b3497eab655672ab1a9f99bf37a57d43
Component: engine
2016-09-19 22:23:37 +02:00
Sebastiaan van Stijn
6851b71de6 Merge pull request #26706 from thaJeztah/update-systemd-instructions
Cleanup / sync RHEL, CentOS, Fedora installation docs
Upstream-commit: 920cb5834b66a27b68b83c5b4e81f027103ced68
Component: engine
2016-09-19 22:10:30 +02:00
Brian Goff
abf6940f56 Merge pull request #26640 from Microsoft/jjh/removeosversion
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04:00
Sebastiaan van Stijn
91ef538450 Cleanup / sync RHEL, CentOS, Fedora installation docs
These installation procedures are very similar, so
synchronized these docs and removed some differences.

Also;

- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
  installation, because most people want to have docker
  started automatically (and overlooked this step).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd
Component: engine
2016-09-19 21:30:57 +02:00
Sebastiaan van Stijn
88878427f1 Merge pull request #26712 from BlueMonday/master
Fix regex for the json-file logger opts in overview.md
Upstream-commit: 772db11fd0cfdf3c22fb93ba69742e81c4a695bb
Component: engine
2016-09-19 21:01:51 +02:00
Sebastiaan van Stijn
fec88c3f0c Merge pull request #26715 from thaJeztah/move-mary-to-alumni
Move Mary to alumni
Upstream-commit: 5bcaa0e4bb1173be7bde75c30423cb13f7a56db0
Component: engine
2016-09-19 20:15:23 +02:00
Steven Erenst
69a3d88de2 Fix regex for the json-file logger opts in overview.md
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.

The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.

Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
Upstream-commit: e9a9015e38fc0996a3dae61393885414b092103f
Component: engine
2016-09-19 10:47:40 -07:00
John Howard
92d37247b3 Windows: OCI process struct convergence
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
Daniel Nephin
89cbe8e685 Only hide commands if the env variable is set.
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a7c8bcac2ba60d6dd25a1157085d9245bed556ce
Component: engine
2016-09-19 13:28:15 -04:00
Daniel Nephin
84957d85e8 Move the search command to the registry package.
And move it back to the top-level command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dda198761b9638ff1a0f5a4522751267d2faca8a
Component: engine
2016-09-19 13:28:15 -04:00
Daniel Nephin
555894f6f3 Move canonical image and container commands into a command group
Hide some top level commands
Add docker container and image inspect commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b993609d5ad4590da72e217bb43786b74aabc183
Component: engine
2016-09-19 13:28:02 -04:00
Kenfe-Mickaël Laventure
13bd68497d Merge pull request #26505 from Microsoft/jjh/ocistep1
Windows OCI convergence step 1
Upstream-commit: 3fd3d28f5f82fc44d5e563c8f90dd00f037b9653
Component: engine
2016-09-19 10:23:11 -07:00
John Howard
8abf4dbc45 Windows: Remove osversion from OCI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
2016-09-19 10:16:15 -07:00
Tõnis Tiigi
aa8b9ee0c3 Merge pull request #26577 from Microsoft/jjh/fstabmount
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
2016-09-19 10:13:46 -07:00
Sebastiaan van Stijn
03207b0f15 Merge pull request #26704 from clbn/patch-1
Fix typos in installation doc for Mac
Upstream-commit: 9d2d89ce6fb009d930d46ede87fce285253df984
Component: engine
2016-09-19 18:25:35 +02:00
Sebastiaan van Stijn
d0d17890ef Merge pull request #26708 from thaJeztah/add-evan-as-curator
Add Evan as curator
Upstream-commit: 1161b10a0a37fcc9de4aa7c621ff2424578fec66
Component: engine
2016-09-19 18:18:51 +02:00
Sebastiaan van Stijn
4fa644c3c4 Move Mary to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6da5889c5b5c7291927073b8d40af00abc67a619
Component: engine
2016-09-19 18:09:30 +02:00
Brian Goff
8050d91e8a Merge pull request #26695 from AkihiroSuda/fix-pause-race
Fix a race in libcontainerd/pausemonitor_linux.go
Upstream-commit: 622faab3f64e0e446753c8e9c5f5e7d3d82ec045
Component: engine
2016-09-19 12:03:56 -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
c64a718ea3 Add Evan as curator
Evan is gonna help triaging issues, so
adding him as a "curator" to make it official

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 32161fc052ab4768dfd82b72e0d1f5b405ab6826
Component: engine
2016-09-19 17:09:34 +02:00
Alex Olshansky
388c6920f1 Fix typos in installation doc for Mac
Signed-off-by: Alex Olshansky <i@creagenics.com>
Upstream-commit: f7af5cc780cb49b6115c726687dec5ef361ca5fb
Component: engine
2016-09-19 16:04:46 +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
Sebastiaan van Stijn
91a19ec9c5 Update sshd example to use ubuntu 16.04
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b81d12e7a10abfb55f164105365ff175a95ae9e9
Component: engine
2016-09-19 12:52:13 +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
Sebastiaan van Stijn
306c301f92 Merge pull request #26682 from yuexiao-wang/fix-typo
Fix typo for docs reference
Upstream-commit: 1ccd79e1a920f9120090f0355cd7b557f8d57631
Component: engine
2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
744afc226e Merge pull request #26691 from YuPengZTE/devSUSE
Add prompt of $
Upstream-commit: abd02a9ba0aea79e0b77b8dfb65c8d77614f3ecf
Component: engine
2016-09-19 10:45:23 +02:00
Akihiro Suda
5a03e9169d Fix a race in libcontainerd/pausemonitor_linux.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 69f00a137c886bd0e06b9fd2bb438f4eab1ade50
Component: engine
2016-09-19 07:42:21 +00:00
YuPengZTE
1ea61b91e9 Add prompt of $
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 638546d1206dd229c5e00df0725de6966725b2e0
Component: engine
2016-09-19 10:46:25 +08:00
Brian Goff
2a72633153 Merge pull request #26616 from tonistiigi/id-digest
Generalize content addressable and reference storage
Upstream-commit: 45a8f680263558657e98c899204a632153b60cde
Component: engine
2016-09-18 09:40:16 -04:00
Brian Goff
9a39a676da Merge pull request #26650 from Microsoft/jjh/firststart
Windows: OCI remove first start
Upstream-commit: bc60f5af847d7ae7b466ecca7fc58a9345ee1084
Component: engine
2016-09-18 09:27:10 -04:00
Brian Goff
efff8ce2a3 Merge pull request #26578 from Microsoft/jjh/ociuser
Windows: Unify OCI user struct
Upstream-commit: 112ba3637da812d4bbfd2095cd71c345eabc1500
Component: engine
2016-09-18 09:20:45 -04:00
Brian Goff
41b6bee4d9 Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
Fix typo in docs. s/methodoligies/methodologies/
Upstream-commit: fcf77620d632457910507db47f8b7380c7276962
Component: engine
2016-09-18 09:09:40 -04:00