e18d559bb3
Add Tõnis Tiigi to MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 178806d2b8b1e3c2cebebacc2199128ec2c280d0
Component: engine
2016-01-06 08:51:52 -08:00
93f70516e8
Windows: Fix build not to sigsegv
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1094542c4ca23096b8d3b10f9f86792769c075e5
Component: engine
2016-01-05 16:08:04 -08:00
1dce35922d
Merge pull request #19056 from clintonskitson/docs-rexray_update
...
Updated docs for consolidated list of REX-Ray providers
Upstream-commit: 7a15586f4fb4d5482b35fc00d1506ea8b36d2b10
Component: engine
2016-01-05 23:53:27 +01:00
3906315c1f
Merge pull request #19077 from AvdN/patch-2
...
example cannot work, pip needs --requirement
Upstream-commit: d9a38126562906381ac6829c4b49d1054e615dc6
Component: engine
2016-01-05 23:50:52 +01:00
17e194f6b9
Merge pull request #16534 from cpuguy83/make_volume_drivers_responsible
...
Move responsibility of ls/inspect to volume driver
Upstream-commit: 55137c19f4333e22de7a1ce121298942021b5251
Component: engine
2016-01-05 17:29:51 -05:00
71c14b2632
Merge pull request #18752 from cpuguy83/fix_broken_pipe_error_on_download_abrt
...
Don't log EPIPE errors on client download abort
Upstream-commit: b4e26a96dad3381fb2757172ecc6e04ac375cd6f
Component: engine
2016-01-05 13:34:57 -08:00
db1910a30c
Move responsibility of ls/inspect to volume driver
...
Makes `docker volume ls` and `docker volume inspect` ask the volume
drivers rather than only using what is cached locally.
Previously in order to use a volume from an external driver, one would
either have to use `docker volume create` or have a container that is
already using that volume for it to be visible to the other volume
API's.
For keeping uniqueness of volume names in the daemon, names are bound to
a driver on a first come first serve basis. If two drivers have a volume
with the same name, the first one is chosen, and a warning is logged
about the second one.
Adds 2 new methods to the plugin API, `List` and `Get`.
If a plugin does not implement these endpoints, a user will not be able
to find the specified volumes as well requests go through the drivers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d3eca4451d264aac564594fe46b8c097bd85a5cc
Component: engine
2016-01-05 16:28:38 -05:00
156d67e60e
Merge pull request #18889 from aaronlehmann/v1-fallback-pull-all-tags
...
Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry
Upstream-commit: 6c30931b06ff44e1ce002002430577b7135d2049
Component: engine
2016-01-05 16:20:04 -05:00
d1e813dc31
Merge pull request #19092 from anusha-ragunathan/builder-rm-merge
...
Remove runconfig.Merge
Upstream-commit: df9a3d100574a7f6176b8ca544dad352493686b2
Component: engine
2016-01-05 15:21:24 -05:00
e6d64cf7a3
Merge pull request #18977 from anusha-ragunathan/builder
...
Use ImageBuildOptions in builder.
Upstream-commit: acfd5eb947bff31239701e754814787e92e1d17f
Component: engine
2016-01-05 11:54:21 -08:00
d708725a46
Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop
...
Windows CI: No integration daemon stop
Upstream-commit: 2b489450d7abc56301e48f11bc6dabb878d7e585
Component: engine
2016-01-05 20:52:51 +01:00
510a74def2
Remove runconfig.Merge
...
Merge was used by builder and daemon. With this commit, the builder
call has been inlined and the function moved to the daemon package,
which is the only other caller.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: eb4ae8e28aa0baf28d6cde1079a5f9c618d475b2
Component: engine
2016-01-05 11:28:55 -08:00
6dbbe91963
Merge pull request #19097 from albers/completion-daemon--cgroup-parent
...
bash completion for `docker daemon --cgroup-parent`
Upstream-commit: 4f8d794c46109547ecbfaf60e57208af7094722e
Component: engine
2016-01-05 19:56:51 +01:00
caf108c7a2
Merge pull request #19045 from wenchma/network_api_update
...
Update docker network api doc
Upstream-commit: 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117
Component: engine
2016-01-05 10:55:56 -08:00
cf47068ecd
Windows CI: No integration daemon stop
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3858873fa87ff5b209e89e70d127d822efc42a6
Component: engine
2016-01-05 10:52:59 -08:00
c150e2d2f0
Merge pull request #19067 from jfrazelle/19029-volume-name
...
update volume name regex
Upstream-commit: 97bed96759678c3611a6cacb533783b0f55fa67b
Component: engine
2016-01-05 10:50:46 -08:00
681245c6b9
Merge pull request #19094 from ReadmeCritic/master
...
Update README URLs based on HTTP redirects
Upstream-commit: 50917521fc64e53b6969bbcffb1e02d28b689cce
Component: engine
2016-01-05 10:46:21 -08:00
97fa207a24
Merge pull request #19098 from albers/completion--isolation
...
bash completion for `--isolation`
Upstream-commit: 9819a9db208633c511167d42407e4e53f22e4aef
Component: engine
2016-01-05 10:37:39 -08:00
966533e9d7
Merge pull request #18399 from tonistiigi/migration-optimization
...
Migration optimizations
Upstream-commit: 5aae5a5fae39cff15f5e92cfe1f80c1c5ef019d9
Component: engine
2016-01-05 10:11:56 -08:00
f688b73835
Use ImageBuildOptions in builder.
...
dockerfile.Config is almost redundant with ImageBuildOptions.
Unify the two so that the latter can be removed. This also
helps build's API endpoint code to be less dependent on package
dockerfile.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5190794f1d85d5406611eb69c270df62ac1cdc7f
Component: engine
2016-01-05 10:09:34 -08:00
8e3f31a35d
bash completion for --isolation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9e624d32500e8e1894558e6dedccad5539345ed0
Component: engine
2016-01-05 09:59:29 -08:00
31535b0034
bash completion for docker daemon --cgroup-parent
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ce2cbde8414380bc6e1e3040acb2c1c7b4c157a8
Component: engine
2016-01-05 09:29:37 -08:00
472e1b020d
Merge pull request #19084 from vdemeester/i-am-all-frozen
...
Remove hello-world:latest tag before integration
Upstream-commit: d5685a65d7fb2a4004c941995809931c840c26b6
Component: engine
2016-01-05 09:26:59 -08:00
95064fe12f
Merge pull request #18751 from clnperez/update-gcc-to-5.3
...
Update gcc to 5.3
Upstream-commit: fd1afe1d59df14e27cdd2d932872fa5c68c8b2dc
Component: engine
2016-01-05 09:15:41 -08:00
7f8bab011e
Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes
...
docs: add note to volume-plugins
Upstream-commit: f67fed5f77f868dc2550cc7267fb454cae2108b3
Component: engine
2016-01-05 09:15:21 -08:00
7f889fdbaa
Update README URLs based on HTTP redirects
...
Signed-off-by: d. khamsing <dkhamsing8@gmail.com >
Upstream-commit: 85599338db90c2ccedcbc9a3855db2ae60cb557a
Component: engine
2016-01-05 09:13:45 -08:00
8cbc6b466a
Merge pull request #19038 from gottwald/logfix
...
Fix race condition in JSONFileLogger.Log
Upstream-commit: b2d00e312b23b9942a1db2ccf6b56288ac3bc57d
Component: engine
2016-01-05 08:52:12 -05:00
907be2c8ba
Remove hello-world:latest tag before integration
...
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0736598b93d7bc94b376c61ada17658dddee9aa3
Component: engine
2016-01-05 14:40:27 +01:00
ba6c4901c7
Merge pull request #19070 from softprops/shiplift_client
...
add shiplift docker client to remote api client list
Upstream-commit: 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d
Component: engine
2016-01-05 14:36:30 +01:00
738f0e36b5
add shiplift docker client to remote api client list
...
Signed-off-by: Doug Tangren <d.tangren@gmail.com >
Upstream-commit: 09e0c9fc24db44217885c58fb6023bcfef211ae0
Component: engine
2016-01-05 08:27:26 -05:00
c69ee1ec9e
Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent
...
Add zsh completion for 'docker daemon --cgroup-parent'
Upstream-commit: 0439e03a2720987785f98496867c20fd71b9fa44
Component: engine
2016-01-05 13:12:02 +01:00
609d075f70
Merge pull request #19075 from HackToday/fixvoldoc
...
Fix the unnecessary parameter
Upstream-commit: 4a4131ac1b5ca28a06802d4e904bc99afa721d1f
Component: engine
2016-01-05 11:51:33 +01:00
23281e4aa3
Merge pull request #19064 from RichardScothern/registry-flag
...
Show the legacy registry flag only in the daemon arguments
Upstream-commit: 14a7048df9234608f36b47183fae00ecb46b7e1f
Component: engine
2016-01-05 11:48:01 +01:00
17d5fbd66c
Merge pull request #19078 from HackToday/19072-fix-str
...
Fix the str missing
Upstream-commit: fccbbe572607999dc147bf9dfc06dac0ba4ee25c
Component: engine
2016-01-05 11:34:36 +01:00
d4f5e05d82
Fix the unnecessary parameter
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 52b944dbba74b7d2be5bcabfe6937a5578020101
Component: engine
2016-01-05 10:26:01 +00:00
722bb40262
Fix a typo error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 289faeac111486f19537a06166f283e73fa44c4b
Component: engine
2016-01-05 17:42:13 +08:00
8584ddc8d5
Fix the str missing
...
Fixes : #19072
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 01e873790e587ebbee761b1f52871901c89c0fc4
Component: engine
2016-01-05 09:32:52 +00:00
7ff06a0e84
example cannot work, pip needs --requirement
...
The example is not explicit, but the requirements.txt file is most likely a list of requirements (i.e. list of packages to be installed)
and not a python package itself. As such it needs the "--requirements" or "-r" option.
Signed-off-by: Anthon van der Neut <anthon@mnt.org >
Upstream-commit: 8c1d0e31b40438efd1017535babf8429164a401f
Component: engine
2016-01-05 09:23:53 +01:00
4ef509bcec
Add zsh completion for 'docker daemon --cgroup-parent'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b5f6605ca20918c9462aad891d4ca2d541d5949e
Component: engine
2016-01-05 07:41:34 +01:00
26e3049dda
Merge pull request #19062 from anusha-ragunathan/cgroup
...
Add ability to set cgroup parent for all containers
Upstream-commit: ebc5a4654eb560b8e1f277e8b041635ce18d5ddd
Component: engine
2016-01-04 16:46:23 -08:00
16edb9ca77
Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
...
Adding Jenkins CI script to sources
Upstream-commit: 78873dd6e57c142ab286a0822a5d61491ac8d383
Component: engine
2016-01-04 15:59:03 -08:00
1a2c2c2776
Adding Jenkins CI script to sources
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8213f8caaaebbe1627a8efc5b4aac8511f2da9aa
Component: engine
2016-01-04 15:53:30 -08:00
0c89fbf389
Add ability to set cgroup parent for all containers
...
Fix #18022
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
26657d68aa
update volume name regex
...
Disallow creating a volume starting with a /.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b46f044bf71309088b30c1172d4c69287c6a99df
Component: engine
2016-01-04 15:00:49 -08:00
ffe759f6e1
Show the legacy registry flag only in the daemon arguments
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: b18fadd115f1c9dcbe5bd49636f82d0993067672
Component: engine
2016-01-04 14:52:39 -08:00
89d18d78c9
Merge pull request #18208 from cpuguy83/restart_links
...
Daemon Restart: attempt to wait for container deps
Upstream-commit: 04234bd16a463af3b5e093ef180351d7b54b6a35
Component: engine
2016-01-04 14:36:00 -08:00
58e545b6bf
Merge pull request #18888 from calavera/event_types
...
Event all the things!
Upstream-commit: 723be0a3325799fd6b2a6b689af54f5a07edf992
Component: engine
2016-01-04 13:07:33 -08:00
c2e5fdc393
Add filter by event type and documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 851fe00c64ffafeb27b12f7b0ed8e41f7720b477
Component: engine
2016-01-04 14:58:04 -05:00
d9c08e13db
Updated docs for consolidated list of REX-Ray providers
...
This commit includes the correct project link and also
includes a consolidated list of drivers that are supported.
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
Upstream-commit: 6084346bec4d4a50939468590c08ea4ca85f5d60
Component: engine
2016-01-04 11:28:25 -08:00
98eaf4874e
Merge pull request #18941 from dnephin/runconfig_in_cli
...
Move runconfig/parse.go into the runconfig/opts package
Upstream-commit: dc4ca0e89785a93faffeb8736dcb14e3e1769ae8
Component: engine
2016-01-04 11:06:18 -08:00
