2bfb10b6f8
Vendoring in libnetwork for the anonymous endpoint
...
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
b1184809c8
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
c3f438b95a
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 37627427a2ad9dcb06a2a6ea958670683a6c7934
Component: engine
2015-10-20 19:56:59 -07:00
82f86233a6
Vendoring in libnetwork to fix daemon bootup instabilities
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
5c5f223189
Merge pull request #17219 from endophage/gotuf_bugfixes
...
some bugfixes on getting tuf files
Upstream-commit: 967e49bdbc1949381cfa0a46493bf1ee8acd4759
Component: engine
2015-10-20 18:13:19 -07:00
a8c08d4980
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
834dc8ee1e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
72a0fc71b0
some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
Upstream-commit: 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c
Component: engine
2015-10-20 13:22:06 -07:00
d2c1aaefe0
Merge pull request #17149 from albers/completion-network-ipam
...
bash completion for new `docker network create` options
Upstream-commit: 3957368eff19170dd4d454b83cb593c8420b9d08
Component: engine
2015-10-20 15:54:05 -04:00
62ebe61ba1
Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option
...
Add zsh completion for 'docker network create -o --opt'
Upstream-commit: 081edfed3253ab315e1c0d2b60ffb72dcdc3a725
Component: engine
2015-10-20 15:48:12 -04:00
c19683280b
Merge pull request #17188 from jfrazelle/fix-release-rpm
...
fix copy of multiple rpms
Upstream-commit: a7868191d43f4a0f73bf792973869f3df5dc8d37
Component: engine
2015-10-20 11:31:35 -07:00
988eb3b3bf
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
e65f97a6f3
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
Upstream-commit: b7fcc71a3c1d63be6f1133d02b29f6298c4f02ff
Component: engine
2015-10-20 19:51:15 +02:00
b0ff94f907
Merge pull request #16984 from estesp/update-busybox
...
Update Dockerfile to use the correct busybox:latest identifier
Upstream-commit: a2d1ec06e65f25f5e60ab550ac61ce46fb158505
Component: engine
2015-10-20 10:35:31 -07:00
fdccaa20d5
Merge pull request #17176 from rhvgoyal/fix-locking-issue
...
devmapper: Drop devices lock before returning from function
Upstream-commit: 7777c1be9bd5604014a0ac3f16e85960c4c0779a
Component: engine
2015-10-20 13:08:29 -04:00
ccde1983ec
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 414cfe946719a0ba811c95486d523e003d44fcc1
Component: engine
2015-10-20 12:03:11 -04:00
db6db88cda
Merge pull request #17035 from estesp/fix-build-dir-perms
...
Correct build-time directory creation with user namespaced daemon
Upstream-commit: ad861876e8bb86091527f31fc944205743e5ce85
Component: engine
2015-10-20 08:57:19 -07:00
acccf55db2
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 08944cdef7397752a686ea800e110a8fa14ce719
Component: engine
2015-10-20 23:07:33 +08:00
348b7977d8
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
Upstream-commit: aa8abf637ad1a2ccd44208ee0d59b24635c71555
Component: engine
2015-10-20 10:48:20 -04:00
47faea6d70
Merge pull request #17191 from mrjana/restart
...
Fix docker startup failure due to dangling endpoints
Upstream-commit: 566964bf73475e994ca605bd2106de045509d23f
Component: engine
2015-10-20 10:32:33 -04:00
0c4bb86354
Merge pull request #17192 from HuKeping/docs-update
...
Docs: update docs for API stats
Upstream-commit: e92a735d7016ec79d0b0a91c0f003b2de2dabf9f
Component: engine
2015-10-20 06:15:58 -07:00
9aebf5450b
Correct build-time directory creation with user namespaced daemon
...
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.
Add tests for the mkdir variants in pkg/idtools
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: ae8c004dc18c59fec9cd67759a5e0087300e872d
Component: engine
2015-10-20 08:59:48 -04:00
cd977f222f
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
Upstream-commit: 89bfbb15162d3745cc871addcd74b2e5f464cfb9
Component: engine
2015-10-20 07:21:28 -04:00
57a4cfdd46
Docs: update docs for API stats
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 969f1d9773509940666a87f8342168bd2a8cf06d
Component: engine
2015-10-20 16:31:20 +08:00
08d2bcc589
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 37b3cd421fcad5513f22a27983167895f4a6cc8d
Component: engine
2015-10-20 13:38:55 +08:00
e1c8600cf0
Fix docker startup failure due to dangling endpoints
...
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 8adfc7e2d2d158a08096f60ff9318db5bb0875bd
Component: engine
2015-10-19 21:29:35 -07:00
f3edec8c49
Vendoring libnetwork
...
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052
Has bug fixes for 1.9
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
57010d523d
Merge pull request #16801 from aidanhs/aphs-add-socat-t
...
Update ambassador image, use the socat -t option
Upstream-commit: b826215c575e320f0cad7c07f8bfdf85437c1be9
Component: engine
2015-10-20 14:24:25 +10:00
e0385bf5ca
Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes
...
MINOR documentation fix.
Upstream-commit: 310725c9331f6f294ab759698e707052efb7bf09
Component: engine
2015-10-19 18:36:42 -07:00
ebd613a0a8
Merge pull request #17088 from Microsoft/sjw/archive_hang_fix
...
Fixing hang in archive.CopyFileWithTar with invalid dst
Upstream-commit: 98c01c2c90c529ed3cbf219bea3f57ba1848e582
Component: engine
2015-10-19 17:18:25 -07:00
e19e8cf7db
Merge pull request #17187 from mavenugo/dopts
...
Fail the container start if the network has been removed
Upstream-commit: 48147d287b85975a8235c8d49a9e3cacce1a1534
Component: engine
2015-10-19 17:12:07 -07:00
3fd414a4f5
fix copy of multiple rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f549b1c9ea7ff99f9f17e59d65f234d93e85c36c
Component: engine
2015-10-19 16:14:06 -07:00
779d8e4c54
Merge pull request #17186 from LK4D4/icc_clear
...
Use more clear message for icc=false + iptables=false
Upstream-commit: b135f758d73e8fa1df5f331e866fb250235f3db4
Component: engine
2015-10-19 15:40:41 -07:00
7958c67364
Merge pull request #17135 from albers/completion-restart-unless-stopped
...
Bash completion for restart policy `unless-stopped`
Upstream-commit: c766bcdc735fcedc9a95103082134e7744f23de3
Component: engine
2015-10-19 15:26:16 -07:00
7955574657
Merge pull request #17148 from albers/completion-dm-options
...
bash completion: support for more devicemapper options
Upstream-commit: 6f4d7dfbf450d95a5df104838aec7cfc59246d46
Component: engine
2015-10-19 15:25:27 -07:00
e4a8ee278c
Fail the container start if the network has been removed
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8755920d0d1b3ef0d094bd75b25018b06d19839a
Component: engine
2015-10-19 15:00:07 -07:00
f6f1715608
devmapper: Drop devices lock before returning from function
...
cleanupDeleted() takes devices.Lock() but does not drop it if there are
no deleted devices. Hence docker deadlocks if one is using deferred
device deletion feature. (--storage-opt dm.use_deferred_deletion=true).
Fix it. Drop the lock before returning.
Also added a unit test case to make sure in future this can be easily
detected if somebody changes the function.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 2f16895ee94848e2d8ad72bc01968b4c88d84cb8
Component: engine
2015-10-19 17:51:17 -04:00
ae482ee1b1
Use more clear message for icc=false + iptables=false
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ab495ab0d0a340dc45ce283dd7e2de6110485156
Component: engine
2015-10-19 14:19:21 -07:00
b4f9b290d4
Merge pull request #17128 from calavera/network_controller_enabled
...
Do not initialize the networking routes when netController is not enabled.
Upstream-commit: 82a8a14c4d039579f80b640b5f815964e99db746
Component: engine
2015-10-19 16:13:31 -04:00
7c21f5021c
Merge pull request #17116 from dmcgowan/increase-ping-timeout
...
Increase ping timeout for registries
Upstream-commit: 1ab5ca2d5bece1167f73aa7566202edabb0e969b
Component: engine
2015-10-19 16:10:01 -04:00
5eb96cf0cf
Fixing hang in archive.CopyWithTar with invalid dst
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: a150eee3085e2e1e4dbaecdd9668deb0ba3ab26b
Component: engine
2015-10-19 11:56:05 -07:00
33442d477a
Merge pull request #16957 from MHBauer/eventsservice-refactor
...
refactor access to daemon member EventsService
Upstream-commit: b27fa6c58e020b35d725b89badb82dbbc5cb84bc
Component: engine
2015-10-19 11:45:29 -07:00
b8b4d2b3f7
Return 404 for all network operations without network controller.
...
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: eb982e7c00192c8306f9c420fb469f087c7b161d
Component: engine
2015-10-19 14:40:18 -04:00
372d5d880d
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 850bc0838a509d220bc78e47aa8203420aca22eb
Component: engine
2015-10-19 19:09:36 +02:00
a641f84771
Merge pull request #17125 from calavera/check_exec_start_json
...
Check the content type is json when calling exec start.
Upstream-commit: bb085b76619e8e73e39f68efb1b407e16da67822
Component: engine
2015-10-19 18:44:42 +02:00
ab68eef7dd
refactor access to daemon member EventsService
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 2abf5d986ec6779555ea615763d3ffccede6121a
Component: engine
2015-10-19 09:41:29 -07:00
f37af18747
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
Upstream-commit: e62fd33d963cdba947a9ef5abe100a9d85c58f24
Component: engine
2015-10-19 12:35:58 -04:00
ffce7de9f8
Merge pull request #16710 from gbarboza/sort_port_display
...
Sort PORTS order in docker ps output
Upstream-commit: 6e0f00ed0a28d8303197afbf418c32d408819992
Component: engine
2015-10-19 18:24:24 +02:00
6f63293742
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
Upstream-commit: df15523745756f2837b436f35621ae16e624fd86
Component: engine
2015-10-19 12:10:31 -04:00
f0927e3716
Check the content type is json when calling exec start.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 45dc57f22931e6cb8ad522602da8aa985bddcfab
Component: engine
2015-10-19 11:46:44 -04:00
