1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Michael Crosby
45fb803316 Improve source for containerd/runc copy
This improves getting the source for the binaries that are compiled on
the system so that they can be copied into the bundles output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-11 12:02:01 -07:00
Serge Hallyn
2a71f28a4e don't try to use aufs in a user namespace
If aufs is already modprobe'd but we are in a user namespace, the
aufs driver will happily load but then get eperm when it actually tries
to do something.  So detect that condition.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-04-11 13:38:15 -05:00
Daniel Nephin
ea2d526246 Bump 1.7.0-rc2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-11 13:26:16 -04:00
Aanand Prasad
2160c787e3 Fix race condition
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:26:16 -04:00
Aanand Prasad
ebae76bee8 Rename a couple of functions in parallel.py
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:26:16 -04:00
Aanand Prasad
720dc893e2 Document parallel helper functions
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:26:16 -04:00
Aanand Prasad
d03f4e4b32 Small refactor to feed_queue()
Put the event tuple into the results queue rather than yielding it from
the function.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:26:16 -04:00
Daniel Nephin
d05feb1a4d Merge pull request #3302 from aanand/feed-queue-refactor
feed_queue() refactor
2016-04-11 12:58:11 -04:00
Vincent Demeester
577adcc1ee Merge pull request #21811 from shishir-a412ed/cleanup_parse_storage_opt
parseStorageOpt: return size rather than updating devInfo.Size field
2016-04-11 18:34:03 +02:00
Riyaz Faizullabhoy
ed99253c3f Merge pull request #672 from Anvil/patch-1
Minor grammar fix in TUF overview
2016-04-11 09:24:53 -07:00
David Calavera
08e27a7148 Merge pull request #21877 from AkihiroSuda/trivial-fix
oci: default devices don't need to be listed explicitly
2016-04-11 09:24:47 -07:00
David Calavera
8d3467626e Move middleware to interfaces.
This makes separating middlewares from the core api easier.
As an example, the authorization middleware is moved to
it's own package.

Initialize all static middlewares when the server is created, reducing
allocations every time a route is wrapper with the middlewares.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-04-11 09:19:27 -07:00
Aanand Prasad
7cfb5e7bc9 Fix race condition
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 17:05:52 +01:00
Aanand Prasad
3722bb38c6 Clarify behaviour of rm and down
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 16:31:27 +01:00
Shishir Mahajan
45dc5b46e2 parseStorageOpt: return size rather than updating devInfo.Size field
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-04-11 10:34:13 -04:00
Brian Goff
517c18ff2b Merge pull request #21914 from sanimej/libn-v0.7rc5
Vendor Libnetwork v0.7.0-rc.6
2016-04-11 10:16:17 -04:00
Dams Nadé
9a38a573de Minor grammar fix in TUF overview
"These files" and "They" are plural.

Signed-off-by: Damien Nadé <github@livna.org>
2016-04-11 15:48:15 +02:00
Aanand Prasad
15c5bc2e6c Rename a couple of functions in parallel.py
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:05:30 +01:00
Vincent Demeester
a692910277 Merge pull request #20853 from WeiZhang555/fix-ShouldRestart
Fix ShouldRestart for on-failure handle
2016-04-11 14:01:52 +02:00
Aanand Prasad
0671b8b8c3 Document parallel helper functions
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:51:27 +01:00
Aanand Prasad
0e3db185cf Small refactor to feed_queue()
Put the event tuple into the results queue rather than yielding it from
the function.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:37:00 +01:00
Sebastiaan van Stijn
8af70e1074 Merge pull request #21908 from sdurrheimer/zsh-completion-volume-ls-filter
Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
2016-04-11 12:24:48 +02:00
Akihiro Suda
b397f978c6 oci: default devices don't need to be listed explicitly
Eliminating these things make the code much more understandable.

See also adcbe530a9/config-linux.md (default-devices)
df25eddce6/libcontainer/specconv/spec_linux.go (L454)

Signed-off-by: Akihiro Suda <suda.kyoto@gmail.com>
2016-04-11 05:58:49 +00:00
Vincent Demeester
c327d9d99b Merge pull request #21919 from MihaiB/docs-typo
docs: fix grammar typo in 'Network containers'
2016-04-10 22:33:55 +02:00
Tom Deseyn
3dc8a7bdc5 azure.md: Improve documentation based on feedback
Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
2016-04-10 20:42:44 +02:00
Maksim Malchuk
d14cfaacfc Disable user-defined ssh_config configurations
Using the user-defined ssh_config configurations bring more problems
instead of enchancements.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2016-04-10 20:27:06 +03:00
Markus Bukowski
fb4b50112d VMware Fusion: static ip addresses (dhcp) are evaluated
Signed-off-by: Markus Bukowski <me@mrbuk.de>
2016-04-10 18:46:36 +02:00
Mihai Borobocea
a609c2c48b docs: fix grammar typo in 'Network containers'
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
2016-04-10 17:22:02 +03:00
Steve Durrheimer
7ad5438555 Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-10 12:52:33 +02:00
Vincent Demeester
3c3b089474 Merge pull request #21917 from sdurrheimer/zsh-completion-new-micro-syslog-format
Add zsh completion for '--log-opt syslog-format=rfc5424micro'
2016-04-10 11:32:48 +02:00
Steve Durrheimer
5534354996 Add zsh completion for '--log-opt syslog-format=rfc5424micro'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-10 11:11:12 +02:00
Vincent Demeester
f9386538ec Merge pull request #21724 from flyinprogrammer/syslog-opts-env-labels
enable syslog logger to have access to env and labels
2016-04-10 10:58:25 +02:00
Zhang Wei
51e42e6ee0 Fix ShouldRestart for on-failure handle
Currently if you restart docker daemon, all the containers with restart
policy `on-failure` regardless of its `RestartCount` will be started,
this will make daemon cost more extra time for restart.

This commit will stop these containers to do unnecessary start on
daemon's restart.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-10 15:44:47 +08:00
Zhang Wei
ffad0873c9 Add test case for stopping a restarting container
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-10 15:39:28 +08:00
Lei Jitang
b4664e3f86 Merge pull request #21854 from WeiZhang555/restart-failure
Fix critical bug: can't restart an restarting container
2016-04-10 11:17:19 +08:00
Vincent Demeester
37d2e12fae Merge pull request #21907 from sdurrheimer/zsh-completion-syslog-format
Add zsh completion for '--log-opt syslog-format'
2016-04-09 23:24:33 +02:00
Vincent Demeester
0f904dc256 Merge pull request #21911 from yongtang/04092016-doc-remote-api-json
Fix incorrect request json body for `/containers/create` in remote API docs.
2016-04-09 22:56:00 +02:00
Sebastiaan van Stijn
3f39035f18 Merge pull request #21819 from tophj-ibm/fix-ensure-emptyfs-other-architectures
Fix .ensure-emptyfs on non-x86_64 architectures
2016-04-09 13:40:45 -07:00
Yong Tang
faf2b6f7aa Docker stats is not working when a container is using another container's network.
This fix tries to fix the issue in #21848 where `docker stats` will not correctly
display the container stats in case the container reuse another container's
network stack.

The issue is that when `stats` is performed, the daemon will check for container
network setting's `SandboxID`. Unfortunately, for containers that reuse another
container's network stack (`NetworkMode.IsConnected()`), SandboxID is not assigned.
Therefore, the daemon thinks the id is invalid and remote API will never return.

This fix tries to resolve the SandboxID by iterating through connected containers
and identify the appropriate SandboxID.

A test case for `stats` remote API has been added to check if `stats` will return
within the timeout.

This fix fixes #21848.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-09 20:15:51 +00:00
Yong Tang
f919a26a9f Fix incorrect request json body for /containers/create in remote API docs.
This fix tries to fix the incorrect request json body for
`/containers/create` in remote API docs.

When using the example json request for `/containers/create`, there are two
errors:
(1). `invalid character '"' after object key:value pair`
     This is because a `,` is missing after `"Volumes": {}`
     This issue exists in v1.20-v1.24
(2). `Invalid --security-opt: ""`
     This is becasue in `"SecurityOpt": [""]` line, an empty string
     `""` is passed yet `""` is not a valid `SecurityOpt`. Either no string,
     or a valid string (e.g., "no-new-privileges") could be used.
     This issue exists in v1.15-v1.24

This fix updates the docs and correct the above two issues.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-09 18:39:33 +00:00
Santhosh Manohar
6dd2c33217 Vendor Libnetwork v0.7.0-rc.6
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-04-09 10:45:13 -07:00
Vincent Demeester
4ac59a1282 Merge pull request #21905 from npcode/docs-authorization-RequestUri
Fix errata; s/RequestUri/ReqestURI/
2016-04-09 18:51:20 +02:00
Vincent Demeester
417fce0b77 Merge pull request #21906 from allencloud/fix-typos-pkg
fix typos in pkg
2016-04-09 18:50:42 +02:00
Steve Durrheimer
6e14ebd030 Add zsh completion for '--log-opt syslog-format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-09 17:34:46 +02:00
allencloud
aef02273d9 fix typos in pkg
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-09 21:18:15 +08:00
Vincent Demeester
a01f4dc229 Merge pull request #21853 from coolljt0725/fix_stats
Fix docker stats missing mem limit
2016-04-09 13:46:58 +02:00
Yi EungJun
94985b4bff Fix errata; s/RequestUri/ReqestURI/
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-09 19:19:35 +09:00
John Howard
f2ed337ac9 Merge pull request #21740 from mindlapse/fixErrorMsg
Improved message when pushing a non-existant image
2016-04-08 20:53:25 -07:00
John Howard
fec6cd2eb9 Merge pull request #20525 from Microsoft/sjw/update-graphdriver-create
Adding readOnly parameter to graphdriver Create method
2016-04-08 20:44:03 -07:00
French Ben
956d9baed6 Merge pull request #1619 from docker/modify-cmd
Updated default cmd
2016-04-08 19:47:20 -07:00