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
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
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
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
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
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
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
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
f9537ab059
Use of checkers on docker_cli_nat_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 26ae6d6b36a40a42706e149a6d1c30c27b5b3355
Component: engine
2015-10-18 20:02:55 +08:00
6bdcb86d86
bash completion: support for dm.use_deferred_* options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2d44ed6d64af79d167502edc2d8dab27b3224069
Component: engine
2015-10-18 04:42:17 -07:00
