Commit graph

21075 commits

Author SHA1 Message Date
Tõnis Tiigi
8420366e7c Merge pull request #19132 from icecrime/maintainer_add_tonis
Add Tõnis Tiigi to MAINTAINERS
2016-01-06 09:34:38 -08:00
David Calavera
4b1872f1ef Merge pull request #18979 from jfrazelle/make-whitelist
Change seccomp blacklist to a whitelist
2016-01-06 09:15:25 -08:00
Arnaud Porterie
178806d2b8 Add Tõnis Tiigi to MAINTAINERS
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-06 08:51:52 -08:00
Brian Goff
5ccd33134f Merge pull request #19113 from Microsoft/jjh/fix-windows-builder
Windows: Fix docker build not to sigsegv the daemon
2016-01-05 20:54:00 -05:00
John Howard
1094542c4c Windows: Fix build not to sigsegv
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-05 16:08:04 -08:00
Sebastiaan van Stijn
7a15586f4f Merge pull request #19056 from clintonskitson/docs-rexray_update
Updated docs for consolidated list of REX-Ray providers
2016-01-05 23:53:27 +01:00
Sebastiaan van Stijn
d9a3812656 Merge pull request #19077 from AvdN/patch-2
example cannot work, pip needs --requirement
2016-01-05 23:50:52 +01:00
Phil Estes
55137c19f4 Merge pull request #16534 from cpuguy83/make_volume_drivers_responsible
Move responsibility of ls/inspect to volume driver
2016-01-05 17:29:51 -05:00
David Calavera
b4e26a96da Merge pull request #18752 from cpuguy83/fix_broken_pipe_error_on_download_abrt
Don't log EPIPE errors on client download abort
2016-01-05 13:34:57 -08:00
Brian Goff
d3eca4451d 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>
2016-01-05 16:28:38 -05:00
Phil Estes
6c30931b06 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
2016-01-05 16:20:04 -05:00
Tibor Vass
df9a3d1005 Merge pull request #19092 from anusha-ragunathan/builder-rm-merge
Remove runconfig.Merge
2016-01-05 15:21:24 -05:00
David Calavera
acfd5eb947 Merge pull request #18977 from anusha-ragunathan/builder
Use ImageBuildOptions in builder.
2016-01-05 11:54:21 -08:00
Sebastiaan van Stijn
2b489450d7 Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop
Windows CI: No integration daemon stop
2016-01-05 20:52:51 +01:00
Anusha Ragunathan
eb4ae8e28a 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>
2016-01-05 11:28:55 -08:00
Vincent Demeester
4f8d794c46 Merge pull request #19097 from albers/completion-daemon--cgroup-parent
bash completion for `docker daemon --cgroup-parent`
2016-01-05 19:56:51 +01:00
moxiegirl
180ff8d501 Merge pull request #19045 from wenchma/network_api_update
Update docker network api doc
2016-01-05 10:55:56 -08:00
John Howard
a3858873fa Windows CI: No integration daemon stop
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-05 10:52:59 -08:00
David Calavera
97bed96759 Merge pull request #19067 from jfrazelle/19029-volume-name
update volume name regex
2016-01-05 10:50:46 -08:00
David Calavera
50917521fc Merge pull request #19094 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2016-01-05 10:46:21 -08:00
David Calavera
9819a9db20 Merge pull request #19098 from albers/completion--isolation
bash completion for `--isolation`
2016-01-05 10:37:39 -08:00
Michael Crosby
5aae5a5fae Merge pull request #18399 from tonistiigi/migration-optimization
Migration optimizations
2016-01-05 10:11:56 -08:00
Anusha Ragunathan
5190794f1d 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>
2016-01-05 10:09:34 -08:00
Harald Albers
9e624d3250 bash completion for --isolation
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-05 09:59:29 -08:00
Harald Albers
ce2cbde841 bash completion for docker daemon --cgroup-parent
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-05 09:29:37 -08:00
Justin Cormack
822c4f79ab
Allow the waitpid syscall
This version is sometimes used eg by glibc on x86

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-05 09:29:16 -08:00
Justin Cormack
ca3ae72e43
Support compatible architectures with default seccomp rules
In the default seccomp rule, allow use of 32 bit syscalls on
64 bit architectures, so you can run x86 Linux images on x86_64
without disabling seccomp or using a custom rule.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-05 09:28:42 -08:00
Tianon Gravi
d5685a65d7 Merge pull request #19084 from vdemeester/i-am-all-frozen
Remove hello-world:latest tag before integration
2016-01-05 09:26:59 -08:00
Jess Frazelle
fd1afe1d59 Merge pull request #18751 from clnperez/update-gcc-to-5.3
Update gcc to 5.3
2016-01-05 09:15:41 -08:00
moxiegirl
f67fed5f77 Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes
docs: add note to volume-plugins
2016-01-05 09:15:21 -08:00
ReadmeCritic
85599338db Update README URLs based on HTTP redirects
Signed-off-by: d. khamsing <dkhamsing8@gmail.com>
2016-01-05 09:13:45 -08:00
Doug Davis
b2d00e312b Merge pull request #19038 from gottwald/logfix
Fix race condition in JSONFileLogger.Log
2016-01-05 08:52:12 -05:00
Vincent Demeester
0736598b93 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>
2016-01-05 14:40:27 +01:00
Vincent Demeester
09ad1bbc58 Merge pull request #19070 from softprops/shiplift_client
add shiplift docker client to remote api client list
2016-01-05 14:36:30 +01:00
softprops
09e0c9fc24 add shiplift docker client to remote api client list
Signed-off-by: Doug Tangren <d.tangren@gmail.com>
2016-01-05 08:27:26 -05:00
Sebastiaan van Stijn
0439e03a27 Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent
Add zsh completion for 'docker daemon --cgroup-parent'
2016-01-05 13:12:02 +01:00
Sebastiaan van Stijn
4a4131ac1b Merge pull request #19075 from HackToday/fixvoldoc
Fix the unnecessary parameter
2016-01-05 11:51:33 +01:00
Sebastiaan van Stijn
14a7048df9 Merge pull request #19064 from RichardScothern/registry-flag
Show the legacy registry flag only in the daemon arguments
2016-01-05 11:48:01 +01:00
Vincent Demeester
fccbbe5726 Merge pull request #19078 from HackToday/19072-fix-str
Fix the str missing
2016-01-05 11:34:36 +01:00
Kai Qiang Wu(Kennan)
52b944dbba Fix the unnecessary parameter
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-05 10:26:01 +00:00
Sebastiaan van Stijn
cd9c641b1d Merge pull request #19079 from wenchma/typo_error
Fix a typo error
2016-01-05 11:06:30 +01:00
Wen Cheng Ma
289faeac11 Fix a typo error
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-05 17:42:13 +08:00
Kai Qiang Wu(Kennan)
01e873790e Fix the str missing
Fixes: #19072
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-05 09:32:52 +00:00
Anthon van der Neut
8c1d0e31b4 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>
2016-01-05 09:23:53 +01:00
Steve Durrheimer
b5f6605ca2 Add zsh completion for 'docker daemon --cgroup-parent'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-05 07:41:34 +01:00
David Calavera
ebc5a4654e Merge pull request #19062 from anusha-ragunathan/cgroup
Add ability to set cgroup parent for all containers
2016-01-04 16:46:23 -08:00
Justin Cormack
d8e06d54cf
Allow sigreturn syscall
This is used on some 32 bit architectures, eg x86

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 16:11:59 -08:00
Jess Frazelle
78873dd6e5 Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
Adding Jenkins CI script to sources
2016-01-04 15:59:03 -08:00
John Howard
8213f8caaa Adding Jenkins CI script to sources
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-04 15:53:30 -08:00
Alexander Morozov
2e3186ab06 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-04 15:16:25 -08:00