Nathan LeClaire
72d9c4d039
Merge pull request #2889 from dgageot/wait-host-only
...
Always wait for the host-only adapter to appear
2016-01-22 12:17:06 -08:00
Phil Estes
34a83f9f2c
Merge pull request #19517 from calavera/validate_config_keys
...
Verify that the configuration keys in the file are valid.
2016-01-22 15:01:29 -05:00
Tibor Vass
2731dbc797
Merge pull request #19509 from BrianBland/master
...
Fixes layer MediaTypes in manifests created from a cross-repository push
2016-01-22 14:27:47 -05:00
David Calavera
27b060492c
Fix channel closing race in event tests.
...
Divide event matching into two functions, a matcher and
a processor. That way, the error handling doesn't call
the channel closing logic at all.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-22 13:31:46 -05:00
David Calavera
5e80ac0dd1
Make TLSOptions and LogConfig embedded structs.
...
That way the configuration file becomes flag, without extra keys.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-22 13:20:17 -05:00
Doug Davis
8d94a85d62
Add some helper text for magical ADD
...
Closes : #15777
Signed-off-by: Doug Davis <dug@us.ibm.com >
2016-01-22 10:13:13 -08:00
David Calavera
ae8f7c69e3
Merge pull request #19549 from cpuguy83/bump_plugin_api_version
...
Bump plugin API version
2016-01-22 09:33:29 -08:00
Jess Frazelle
21ec6d3789
Merge pull request #19146 from mikedougherty/cs-105-download-script
...
Create a bundle for the install script to support other domains
2016-01-22 09:25:24 -08:00
Tibor Vass
a9fc4939df
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
Jess Frazelle
05b2f342fd
Merge pull request #19588 from tianon/docker.default-systemd
...
Add a note to /etc/default/docker noting that it does not apply to systemd
2016-01-22 08:52:02 -08:00
Vincent Demeester
73ae424ed8
Merge pull request #19470 from Microsoft/jjh/confans
...
Windows: VirtualTerminalInput native console
2016-01-22 17:27:47 +01:00
Tibor Vass
cba7ba25f4
Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
...
Enable DockerTrustSuite for ARM again
2016-01-22 11:23:19 -05:00
Tianon Gravi
90e33640b8
Add a note to /etc/default/docker noting that it does not apply to systemd
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2016-01-22 07:35:02 -08:00
Dimitar Bonev
3a72edb906
Network fields schema validation
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com >
2016-01-22 16:42:10 +02:00
Patrik Erdes
1a8ec8c722
Fix #2905 , a Swarm host will now show as active by the active command when using the env --swarm option
...
Signed-off-by: Patrik Erdes <patrik@erdes.se >
2016-01-22 15:18:44 +01:00
Patrik Erdes
92b9853478
Fix #2903 , revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
...
Signed-off-by: Patrik Erdes <patrik@erdes.se >
2016-01-22 14:51:59 +01:00
scaleoutsean
bdc8241da9
Add GPFS
...
Signed-off-by: Sean Lee <seanlee@tw.ibm.com >
2016-01-22 21:12:47 +08:00
Sven Dowideit
5450625f81
Upgrade git-for-windows to 2.7.0, and vbox to 5.0.14
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-01-22 22:12:06 +10:00
Aanand Prasad
35788f47ff
Merge pull request #2729 from shin-/bump_docker_py
...
Use latest docker-py rc
2016-01-22 11:40:35 +00:00
Aanand Prasad
49c83b16c2
Merge pull request #2726 from aanand/no-logs-on-interactive-run
...
Pass logs=False to dockerpty
2016-01-22 11:37:58 +00:00
Vincent Demeester
c91045a78b
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
2016-01-22 11:18:53 +01:00
Aleksa Sarai
cc19c7df2a
integration-cli: add bad --cgroup-parent tests
...
To ensure we don't regress on bad --cgroup-parent paths, add some
integration tests that check that the host hasn't toppled (or suddently
started to create files in the host).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-01-22 20:16:56 +11:00
Aleksa Sarai
40b5eebb0b
vendor: *: update libcontainer
...
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-01-22 20:15:09 +11:00
Jean-Laurent de Morlhon
c341a289e1
Merge pull request #2900 from zchee/fix-typo-vb-misc
...
Fix typo
2016-01-22 09:32:55 +01:00
Vincent Demeester
c3a9ecedba
Merge pull request #19574 from polonskiy/patch-2
...
fixed typo
2016-01-22 09:14:58 +01:00
Anton Polonskiy
b0873c2c50
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
2016-01-22 09:27:53 +02:00
Koichi Shiraishi
9ea9399fa8
Fix typo
...
Signed-off-by: Koichi Shiraishi <k@zchee.io >
2016-01-22 14:13:24 +09:00
Santhosh Manohar
da9eadb066
IT for service/network name with '.', corrected libnetwork flag for DNS
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2016-01-21 20:49:02 -08:00
Santhosh Manohar
02c9d48144
Vendor in libnetwork v0.6.0-rc2
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2016-01-21 20:46:28 -08:00
Mike Dougherty
51dad1185a
Create a bundle for the install script to support other domains
...
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.
This install script is used in to change the URLs instead of sed in
release.sh.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
2016-01-21 20:42:20 -08:00
Prayag Verma
d72145f618
Update copyright years
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com >
2016-01-22 10:07:01 +05:30
Doug Davis
6f22d9ec4e
Merge pull request #19562 from MHBauer/nospace-checktheoutput
...
check the output, not the errcode
2016-01-21 22:09:41 -05:00
John Howard
845dc1b24c
Windows: TestPsNotShowPortsOfStoppedContainer linux only
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-01-21 18:48:21 -08:00
Joffrey F
9e67eae311
Match named volumes in service definitions with declared volumes
...
Raise ConfigurationError for undeclared named volumes
Test new behavior
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-21 18:10:53 -08:00
Joffrey F
77b435f4fe
Use latest docker-py rc
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-21 18:07:14 -08:00
Arun Gupta
e25d47db27
adding docs for Dockerizing Couchbase service
...
cleaning up instructions, removing redundant output
Signed-off-by: Arun Gupta <arun.gupta@gmail.com >
adding the latest feedback
Signed-off-by: Arun Gupta <arun.gupta@gmail.com >
2016-01-21 17:58:43 -08:00
Olivier Gambier
caa2001e1f
Merge pull request #1341 from moxiegirl/fix-issue-1254
...
Pulling driver specs out of configuruation.md
2016-01-21 16:57:23 -08:00
Jessica Frazelle
bed0bb7d01
move default seccomp profile into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-21 16:55:29 -08:00
Jessica Frazelle
35e50119fc
move default apparmor policy into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-21 16:55:27 -08:00
Phil Estes
3233f45609
Merge pull request #19263 from jfrazelle/update-aa-parser
...
refactor aaparser pkg, add unit tests
2016-01-21 19:40:53 -05:00
Ying Li
499d5a7c0c
Add an extra targets/b delegation chain to the tests.
...
Also, shorten some of the options (do not specify false, since that's default).
Signed-off-by: Ying Li <ying.li@docker.com >
2016-01-21 16:34:53 -08:00
Jess Frazelle
6e16ec2b9c
Merge pull request #19529 from Microsoft/jjh/dockerfile
...
Windows: Update dockerfile for Windows to Windows CI
2016-01-21 15:46:08 -08:00
Daniel Nephin
963ec1ceda
Merge pull request #2707 from dnephin/add_stop_signal_to_docs
...
Add stop signal to the docs
2016-01-21 18:41:28 -05:00
Morgan Bauer
bcb9adf49e
check the output, not the errcode
...
- errcode of 1 can be returned for cases other than the 'no space left' case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2016-01-21 15:23:20 -08:00
Brian Goff
9ae51b3e0f
Merge pull request #19383 from calavera/container_store
...
Extract container store from the daemon.
2016-01-21 17:20:47 -05:00
Victor Vieux
5cb6f218dd
Merge pull request #1662 from dongluochen/avoidSimultaneousValidation
...
Enforce minimum backoff to avoid simultaneous validation on one engine
2016-01-21 14:19:06 -08:00
Dong Chen
46a33f70ff
Use exponential backoff strategy to validate pending engine.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-21 14:02:34 -08:00
David Calavera
ed4038676f
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-21 16:56:12 -05:00
Dongluo Chen
cd68850690
Merge pull request #1665 from vieux/type_changelog
...
update year typo in the CHANGELOG
2016-01-21 13:53:50 -08:00
Sebastiaan van Stijn
45db4fa70e
Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
...
Carry 19305: Added `dead` to docs for docker ps -f status=...
2016-01-21 13:46:51 -08:00