Commit Graph

22165 Commits

Author SHA1 Message Date
35dbb56580 docs: update installation from binaries for 1.11
Binaries are now distributed as a '.tgz' or '.zip'
archive, and contain multiple binaries for Linux.

This updates the instructions for 1.11.

Also mention that the Windows 64-bit binary
actually can be used as a daemon. Given that
this is still in beta, no instructions were
added for *running* a daemon on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f5336c737086a4c1807bb2b6ab57116b5ed9d769
Component: engine
2016-04-13 15:26:03 +02:00
da8ff9f6e7 Merge pull request #21959 from coolljt0725/fix_21957
Fix docker load progressbar, fixes #21957
Upstream-commit: 348d90276802aac6c76126f2fe6866c521190ecd
Component: engine
2016-04-13 00:31:27 -04:00
94711fe63a Fix docker load progressbar, fixes #21957
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 96d7db665b06cc0bbede22d818c69dc5f6921f66
Component: engine
2016-04-12 22:45:42 -04:00
7a5c745f9d Merge pull request #21949 from aaronlehmann/vendor-distribution-1622
Vendor distribution to correct config blob media type in schema2 manifest
Upstream-commit: 40502e381371763ea0942b7d6511f5c98b65bc1e
Component: engine
2016-04-12 21:23:22 -04:00
56e19c6402 Merge pull request #21337 from yongtang/21247-TestRunAttachFailedNoLeak
Flaky test: TestRunAttachFailedNoLeak (#21247)
Upstream-commit: fa4fea32330c11b337873698c4a79244aabef4d2
Component: engine
2016-04-12 17:40:16 -07:00
2ba8d1600c Merge pull request #21962 from Microsoft/jjh/logssincefuturefollow
Windows: Disable flakey LogsSinceFutureFollow
Upstream-commit: f3dcc1c46249ffc4a73ab2005d1ad011dff3c7df
Component: engine
2016-04-12 15:07:51 -07:00
e1986078c7 Merge pull request #21897 from calavera/remove_authorization_refs_from_api
Move middleware to interfaces.
Upstream-commit: 9438572fc00f928ec83c884992d5492a7a68babb
Component: engine
2016-04-12 14:08:36 -07:00
13ff1eed5b Merge pull request #21714 from hallyn/2016-03-31/aufs.2
don't try to use aufs in a user namespace
Upstream-commit: 7c16063afaafaddf0b738fe9ad6221f55ee85a99
Component: engine
2016-04-12 14:07:51 -07:00
c8bf9bd25d Windows: Fix flakey LogsSinceFutureFollow
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: acaef7caaf6078719d8e838efad0fb1b7ce153d8
Component: engine
2016-04-12 13:27:29 -07:00
ac02172c8d Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners
pkg: listeners: move Docker-specific semantics to docker/daemon*
Upstream-commit: b6a08c3f117c5507e41a1e19c7b44229522409b1
Component: engine
2016-04-12 12:04:03 -07:00
28a44b680b Merge pull request #21904 from yongtang/21848-stats-connected-containers
Docker stats is not working when a container is using another container's network.
Upstream-commit: d648d40ace5440d1a3c8c9dbc1115d40ebcbae3c
Component: engine
2016-04-12 10:28:05 -07:00
e6c347efc9 Merge pull request #21943 from Microsoft/jstarks/utilityvm
Windows: support embedded utility VM images
Upstream-commit: 7b5a6844c2a517e8b6927666e33becf341ac016b
Component: engine
2016-04-12 10:19:47 -07:00
9fa6291e4f Merge pull request #21948 from tianon/check-config-network
Add "VXLAN" to check-config.sh
Upstream-commit: 8cb511b7d68b8d4a053ca260070ba781360bbdbf
Component: engine
2016-04-12 10:10:48 -07:00
d31afa6053 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>
Upstream-commit: fee7e7c7a31023be9f0c26608e6cbd4e8a97d25b
Component: engine
2016-04-12 16:45:05 +02:00
41e374e687 Merge pull request #21818 from Microsoft/jjh/tp4fortests
Windows: Remove TP4 support from test code
Upstream-commit: a0e7e1376605541d988387967f69469d25af060a
Component: engine
2016-04-12 10:07:12 +02:00
b1684f92ee 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>
Upstream-commit: 5ee0a94101c30a4ac22379fdab50c0faad2d12c9
Component: engine
2016-04-12 12:50:43 +10:00
60b2b4b1f7 Vendor distribution to correct config blob media type in schema2 manifest
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in https://github.com/docker/distribution/pull/1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c18d03a7783bb78b7568bf3c23644888995e9a5d
Component: engine
2016-04-11 17:29:17 -07:00
78ecc63dec 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>
Upstream-commit: c70f153f52c8ca75a395d4dc1c4a5759871ada19
Component: engine
2016-04-11 17:16:17 -07:00
385a33a1f9 Add "VXLAN" to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c082dad637f2b7ee07a284143566746c98bf1211
Component: engine
2016-04-11 16:42:53 -07:00
86ed4f4024 Windows: Remove TP4 support from test code
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b0e24c73931d70ef543a3d69c41b0add7130cb80
Component: engine
2016-04-11 15:36:31 -07:00
03c94efb60 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>
Upstream-commit: 15b0f06a9ad6778deeb9560c2f353e29d4f795da
Component: engine
2016-04-11 13:23:38 -07:00
43be88856e 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>
Upstream-commit: 45fb80331662b107ee523d184aef83fa3cae97f2
Component: engine
2016-04-11 12:02:01 -07:00
2be81f74a1 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>
Upstream-commit: 2a71f28a4e1167dee32aa16ddbc819c9d9e77f71
Component: engine
2016-04-11 13:38:15 -05:00
0d8d22c8a5 Merge pull request #21811 from shishir-a412ed/cleanup_parse_storage_opt
parseStorageOpt: return size rather than updating devInfo.Size field
Upstream-commit: 577adcc1eeb58ab29cfbcd50048576b9c8f64584
Component: engine
2016-04-11 18:34:03 +02:00
431401c264 Merge pull request #21877 from AkihiroSuda/trivial-fix
oci: default devices don't need to be listed explicitly
Upstream-commit: 08e27a714895fd9c996a87cf1dc8bf0b7c3bcd6a
Component: engine
2016-04-11 09:24:47 -07:00
8194e834c4 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>
Upstream-commit: 8d3467626ee26cad48ad84f2181552dce7afccb6
Component: engine
2016-04-11 09:19:27 -07:00
0e63dec985 parseStorageOpt: return size rather than updating devInfo.Size field
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 45dc5b46e2018d0a8c2d15c6b2917f3581211a6e
Component: engine
2016-04-11 10:34:13 -04:00
1e5480f7dd Merge pull request #21914 from sanimej/libn-v0.7rc5
Vendor Libnetwork v0.7.0-rc.6
Upstream-commit: 517c18ff2b1d326986bc5448ecc770c6def8e442
Component: engine
2016-04-11 10:16:17 -04:00
870a7271d1 Merge pull request #20853 from WeiZhang555/fix-ShouldRestart
Fix ShouldRestart for on-failure handle
Upstream-commit: a692910277dfbd077af4db891cab0c4130962377
Component: engine
2016-04-11 14:01:52 +02:00
e4a68dcb31 Merge pull request #21908 from sdurrheimer/zsh-completion-volume-ls-filter
Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
Upstream-commit: 8af70e107438382e599baa42b8a06c0d972e1bd5
Component: engine
2016-04-11 12:24:48 +02:00
7efc78fc65 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>
Upstream-commit: b397f978c60d8142cfa679030f01ba00ecc5e976
Component: engine
2016-04-11 05:58:49 +00:00
d40ee881f1 docs: fix grammar typo in 'Network containers'
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
Upstream-commit: a609c2c48b5d504120777db2ac1ba83bfe355b66
Component: engine
2016-04-10 17:22:02 +03:00
22b918f431 Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7ad5438555c9fbe5dc3b82f993db73862974280a
Component: engine
2016-04-10 12:52:33 +02:00
b51f29d979 Add zsh completion for '--log-opt syslog-format=rfc5424micro'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 553435499670a0a2408ace95a5f6b19d4737a648
Component: engine
2016-04-10 11:11:12 +02:00
b83c7378b4 Merge pull request #21724 from flyinprogrammer/syslog-opts-env-labels
enable syslog logger to have access to env and labels
Upstream-commit: f9386538ec6744512a07b61fe06e953b52065ead
Component: engine
2016-04-10 10:58:25 +02:00
c018129666 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>
Upstream-commit: 51e42e6ee01eb4b5c8c7678e2fc7be0f13ef6a68
Component: engine
2016-04-10 15:44:47 +08:00
afb9d9b8d8 Merge pull request #21854 from WeiZhang555/restart-failure
Fix critical bug: can't restart an restarting container
Upstream-commit: b4664e3f8669ca02925c31a08822b73ee7969bd5
Component: engine
2016-04-10 11:17:19 +08:00
72fdd1b243 Merge pull request #21907 from sdurrheimer/zsh-completion-syslog-format
Add zsh completion for '--log-opt syslog-format'
Upstream-commit: 37d2e12faef82dfbfffb7da3fa8f9bf5d8db24e5
Component: engine
2016-04-09 23:24:33 +02:00
60e79acdb1 Merge pull request #21911 from yongtang/04092016-doc-remote-api-json
Fix incorrect request json body for `/containers/create` in remote API docs.
Upstream-commit: 0f904dc2561e7d5c4a0a9435610132e94de377a1
Component: engine
2016-04-09 22:56:00 +02:00
212dd88448 Merge pull request #21819 from tophj-ibm/fix-ensure-emptyfs-other-architectures
Fix .ensure-emptyfs on non-x86_64 architectures
Upstream-commit: 3f39035f1862b20aa59c0e26f42794df9ff731bc
Component: engine
2016-04-09 13:40:45 -07:00
7511f16a58 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>
Upstream-commit: faf2b6f7aaca7f9ef400e227921b8125590fc9e5
Component: engine
2016-04-09 20:15:51 +00:00
8e90b734bc 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>
Upstream-commit: f919a26a9fb96ef07133183b4f693ff9508ae823
Component: engine
2016-04-09 18:39:33 +00:00
f43c0844fa Vendor Libnetwork v0.7.0-rc.6
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 6dd2c3321793c3fe60abb94b88018e4b096f12c7
Component: engine
2016-04-09 10:45:13 -07:00
329133f6f0 Merge pull request #21905 from npcode/docs-authorization-RequestUri
Fix errata; s/RequestUri/ReqestURI/
Upstream-commit: 4ac59a12824059f1323e5faee78a37f4612ed54f
Component: engine
2016-04-09 18:51:20 +02:00
6009e3b566 Merge pull request #21906 from allencloud/fix-typos-pkg
fix typos in pkg
Upstream-commit: 417fce0b77d21d8481c6e8b0cad6cb25c6da7bb8
Component: engine
2016-04-09 18:50:42 +02:00
f17ace9c5a Add zsh completion for '--log-opt syslog-format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6e14ebd030ac8803438a183d5135100320caa035
Component: engine
2016-04-09 17:34:46 +02:00
f4582c23f4 fix typos in pkg
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: aef02273d9cdf8144b95c9c9a8d1e119d24b2d9d
Component: engine
2016-04-09 21:18:15 +08:00
9a26745f83 Merge pull request #21853 from coolljt0725/fix_stats
Fix docker stats missing mem limit
Upstream-commit: a01f4dc2292ecba30b1e3db3251e6408610f8c8f
Component: engine
2016-04-09 13:46:58 +02:00
d74513a461 Fix errata; s/RequestUri/ReqestURI/
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 94985b4bfff4fec6f4a7cb0b0f8b641a7dcfcbd1
Component: engine
2016-04-09 19:19:35 +09:00
c32760ad06 Merge pull request #21740 from mindlapse/fixErrorMsg
Improved message when pushing a non-existant image
Upstream-commit: f2ed337ac9834b600dbe5afbdaa2146c9e5d71c1
Component: engine
2016-04-08 20:53:25 -07:00