Commit Graph

21569 Commits

Author SHA1 Message Date
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
Phil Estes e8532023f2 Allow root non-userns metadata backwards compatibility
Instead of creating a "0.0" subdirectory and migrating graphroot
metadata into it when user namespaces are available in the daemon
(currently only in experimental), change the graphroot dir permissions
to only include the execute bit for "other" users.

This allows easy migration to and from user namespaces and will allow
easier integration of user namespace support into the master build.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-05 11:51:14 -05:00
Sebastiaan van Stijn 72472f5639 fix markdown and typos in API docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-05 16:33:32 +01: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
Jessica Frazelle b46f044bf7
update volume name regex
Disallow creating a volume starting with a /.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 15:00:49 -08:00
Richard Scothern b18fadd115 Show the legacy registry flag only in the daemon arguments
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-04 14:52:39 -08:00
Michael Crosby 04234bd16a Merge pull request #18208 from cpuguy83/restart_links
Daemon Restart: attempt to wait for container deps
2016-01-04 14:36:00 -08:00
David Calavera 723be0a332 Merge pull request #18888 from calavera/event_types
Event all the things!
2016-01-04 13:07:33 -08:00
David Calavera 851fe00c64 Add filter by event type and documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-04 14:58:04 -05:00
Justin Cormack 923609179b
Add _llseek syscall
This is the newer verion of lseek on many 32 bit platforms

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:28 -08:00
Justin Cormack d6a9c5abed
Do not allow obsolete syscalls
sysfs and ustat syscalls are marked obsolete.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:28 -08:00
Justin Cormack c1b57fc1c9
Do not allow name_to_handle_at, as we have already blocked open_by_handle_at
Being able to obtain a file handle is no use as we cannot perform
any operation in it, and it may leak kernel state.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:27 -08:00
Jessica Frazelle a1747b3cc8
add 32bit syscalls to whitelist
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 11:55:26 -08:00
Jessica Frazelle 17735c3c98
change seccomp blacklist to whitelist
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 11:55:21 -08:00
Daniel Nephin 0007f5a859 Move some validators from opts to runconfig/opts.
These validators are only used by runconfig.Parse() or some other part of the
client, so move them into the client-side package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-04 14:35:36 -05:00
Clinton Kitson 6084346bec 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>
2016-01-04 11:28:25 -08:00