0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23650 commits 14 branches 412 tags 338 MiB
Commit graph

23650 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Calavera
b6a08c3f11 Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners 
pkg: listeners: move Docker-specific semantics to docker/daemon*
 2016-04-12 12:04:03 -07:00
Alexander Morozov
d648d40ace Merge pull request #21904 from yongtang/21848-stats-connected-containers 
Docker stats is not working when a container is using another container's network.
 2016-04-12 10:28:05 -07:00
Alexander Morozov
7b5a6844c2 Merge pull request #21943 from Microsoft/jstarks/utilityvm 
Windows: support embedded utility VM images
 2016-04-12 10:19:47 -07:00
Alexander Morozov
8cb511b7d6 Merge pull request #21948 from tianon/check-config-network 
Add "VXLAN" to check-config.sh
 2016-04-12 10:10:48 -07:00
Phil Estes
595104daf6 Merge pull request #21960 from rhcarvalho/shm-validation-typo 
Fix a typo in hostConfig.ShmSize validation
 2016-04-12 12:05:31 -04:00
Rodolfo Carvalho
fee7e7c7a3 Fix a typo in hostConfig.ShmSize validation 
Other places referring to the same configuration, including docs, have
the correct spelling.

Signed-off-by: Rodolfo Carvalho <rhcarvalho@gmail.com>
 2016-04-12 16:45:05 +02:00
Vincent Demeester
a0e7e13766 Merge pull request #21818 from Microsoft/jjh/tp4fortests 
Windows: Remove TP4 support from test code
 2016-04-12 10:07:12 +02:00
Aleksa Sarai
5ee0a94101 pkg: listeners: move Docker-specific semantics to docker/daemon* 
Since there are other users of pkg/listeners, it doesn't make sense to
contain Docker-specific semantics and warnings inside it. To that end,
move the scary warning about -tlsverify and the libnetwork port
allocation code to CmdDaemon (where they belong). This helps massively
reduce the dependency tree for users of pkg/listeners.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-12 12:50:43 +10:00
John Starks
c70f153f52 Windows: Support embedded utility VM images 
For TP5, the utility VM for Hyper-V containers is embedded in the base
layer's contents.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-11 17:16:17 -07:00
Tianon Gravi
c082dad637 Add "VXLAN" to check-config.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-04-11 16:42:53 -07:00
John Howard
b0e24c7393 Windows: Remove TP4 support from test code 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-04-11 15:36:31 -07:00
Alexander Morozov
2bcb6d694f Merge pull request #21941 from crosbymichael/copy-bins 
Improve source for containerd/runc copy
 2016-04-11 14:54:21 -07:00
John Starks
15b0f06a9a Windows: Revendor Microsoft/hcsshim 
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-11 13:23:38 -07:00
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
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
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
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
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
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
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
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
Sebastiaan van Stijn
fd67c8b203 Merge pull request #21868 from anusha-ragunathan/not-exp-requirement 
Add non-experimental daemon as a test requirement.
 2016-04-08 17:55:16 -07:00
Sebastiaan van Stijn
eaa1e8a8c4 Merge pull request #21839 from WeiZhang555/add-start-event 
Add missing "start" event back for auto-restart container
 2016-04-08 17:52:22 -07:00
Alan Scherger
f67b711277 enable syslog logger to have access to env and labels 
Signed-off-by: Alan Scherger <flyinprogrammer@gmail.com>
 2016-04-08 19:50:18 -05:00
Sebastiaan van Stijn
3bac588335 Merge pull request #21900 from vieux/type 
fix typo in comment
 2016-04-08 17:46:41 -07:00
David Calavera
f62b26571a Merge pull request #21894 from Microsoft/sjw/nanoserver-fix 
Fixing warning to correctly output error string.
 2016-04-08 16:43:07 -07:00
Stefan J. Wernli
3c220cfcba Fixing warning to correctly output error string. 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2016-04-08 15:04:04 -07:00
David Calavera
a3007ceccc Merge pull request #21773 from yongtang/21765-stats-HumanSize-to-BytesSize 
Change HumanSize to BytesSize for memory output in `docker stats`.
 2016-04-08 14:56:22 -07:00