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
2b52981204
add test script for built debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 14e85c8c556bae67584e71f5c4bb6322c77a3ef5
Component: engine
2015-10-19 16:15:27 -07:00
ee5b4b81d9
add generate aa profile to deb install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
2015-10-19 16:15:25 -07:00
7b13db8ce9
add dh-apparmor & apparmor to deb builder dockerfiles
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c39689ca70193f9fdc60a3ae3dbfd0ef979966ba
Component: engine
2015-10-19 16:15:22 -07:00
d4a80fd40a
change default docker-engine profile to a template based on apparmor_parser version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 8cf89245f5b5f9abb066f599cb69bfe0202bae5d
Component: engine
2015-10-19 16:15:18 -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
d8e401cd76
use gocheck asserts instead of fatal
...
- for #16756
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: eedeeaf49c49cc75ab30a01676736637224ddd8a
Component: engine
2015-10-19 12:30:22 -07: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
3d77e3349b
Docker is calling cont.Destroy twice on success
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 0c518b6ab2b2ed481f7f7da3e38f5f2becfc5b2f
Component: engine
2015-10-19 14:53:55 -04: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
1b16dfd5d6
Don’t overwrite layer checksum on push
...
After v1.8.3 layer checksum is used for image ID
validation. Rewriting the checksums on push would
mean that next pulls will get different image IDs
and pulls may fail if its detected that same
manifest digest can now point to new image ID.
Fixes #17178
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb4a7256921b9863bd27079ec821b9612368fee8
Component: engine
2015-10-19 11:44:16 -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
a6401cddfe
Merge pull request #16986 from clnperez/test-inspect-warn-fix
...
Fix TestInspectInt64 for kernels without swap limit capability
Upstream-commit: d0b4e7a0642b129f7b927c45b1e140372b28ac76
Component: engine
2015-10-19 11:54:28 -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
d4f1e8054e
Change sorting method and add test to DisplayablePorts
...
Signed-off-by: Garrett Barboza <garrett@garrettbarboza.com >
Upstream-commit: c4c6d33bbcacab113f874b7407499c5f71cf72a0
Component: engine
2015-10-19 10:38:54 -05:00
35d6e8b916
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: ae29bd435bafad06f4701c4fbdf6aa8e106409e3
Component: engine
2015-10-19 08:56:32 -05:00
cd8273e40c
Merge pull request #17127 from gesellix/docs-filters-query
...
docs: fix description of `filters` param for /volumes and /networks.
Upstream-commit: 8005dbd748103357949e6ece5cad35fcb3f15018
Component: engine
2015-10-19 09:49:37 -04:00
f833d205f0
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: fbb01b816288c5cf3eb79358c035072766b6e0f0
Component: engine
2015-10-19 21:17:37 +08:00
4a486cfe36
Merge pull request #17155 from janten/meitner
...
Correct Lise Meitner's name, add Euler and Noether
Upstream-commit: 8eba018b610e425960ffb4620dd7a0bfde5238d9
Component: engine
2015-10-19 08:26:55 -04:00
9688b9f21e
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
Upstream-commit: 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f
Component: engine
2015-10-19 08:25:32 -04:00
eb8940de3d
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
Upstream-commit: 1c783567c06e52288bbff73168ee3596e2d357e7
Component: engine
2015-10-19 08:21:17 -04:00
12d92cfae8
emit a "tag" event when building image with "-t" parameter
...
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 2968fa44eb2a53c121ad2b27c519ae47ca7653c3
Component: engine
2015-10-19 20:09:14 +08:00
07d916aab1
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: f3b2b8700f63654ff5c361dedfcf539eb6ee9ef6
Component: engine
2015-10-19 19:44:04 +08:00
2317835b8a
use of checkers on docker_cli_start_volume_driver_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: a91a874f73ac8da43b76d142c79bd68447afd9bf
Component: engine
2015-10-19 19:19:57 +08:00
0b8125559d
use of checkers on docker_cli_diff_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 7be79767c18a1643e9e8e9be1764f2c838152c0b
Component: engine
2015-10-19 19:07:59 +08:00
8f92947edf
Merge pull request #16897 from sunyuan3/docker_cli_rm_test
...
use of checkers on docker_cli_rm_test.go
Upstream-commit: eaa1fc41c6cbdf589831d607e86e0ee38c2d053f
Component: engine
2015-10-19 09:14:23 +02:00
a835b763db
Merge pull request #17162 from echo33/docker_cli_exec_unix_test
...
use of checkers on docker_cli_exec_unix_test.go
Upstream-commit: cfdb954303d031b85847483765b2ca98fc8d3f79
Component: engine
2015-10-19 08:54:42 +02:00
e8502d163c
use of checkers on docker_cli_exec_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: d65ac42ca8ca368e0e6dc5ec9a26f8ec13b98ef4
Component: engine
2015-10-19 15:14:59 +08:00
91f3592865
use of checkers on docker_cli_rm_test.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 0780ddc498f093cec67edd358e00add82c5efd5a
Component: engine
2015-10-19 10:42:56 +08:00
4910236f92
Fix spelling error, add Noether and Euler
...
Signed-off-by: Jan-Gerd Tenberge <janten@gmail.com >
Upstream-commit: ab31d9500ebe0c3bf039321bb8c83c7b01c21e4e
Component: engine
2015-10-19 01:14:39 +02:00
21e856394e
Merge pull request #17157 from ripcurld00d/fedora_doc
...
Update fedora doc
Upstream-commit: bab701c1438bb50072967c579c2d072a1c31cf5f
Component: engine
2015-10-18 14:41:07 -07:00
94c05d87ae
Update fedora doc
...
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6a648659915ad2be4b1e5841594279020821bec1
Component: engine
2015-10-18 23:00:23 +03:00
a455baadf1
Merge pull request #17008 from liaoqingwei/dev1
...
Update testcases: use of checkers on docker_cli_nat_test.go
Upstream-commit: bece5b82a89081816bc622d3c3e9178251013636
Component: engine
2015-10-18 18:11:02 +02:00
1ca6fb8dba
bash completion for docker cp supports copying both ways
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c71c7f4b4f6fe95982c132c42c990e2d4085bb90
Component: engine
2015-10-18 08:24:02 -07:00
33c930fc65
Add zsh completion for 'docker network create -o --opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6447abfc35e80eb05d1f4ae16577378dcbff61e6
Component: engine
2015-10-18 15:09:59 +02:00
