5b46df94e1
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
Upstream-commit: b0cbc0228380517ebc5248905f92f6898ea38289
Component: engine
2015-10-12 10:03:18 -07:00
ae24831060
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
Upstream-commit: 2d1414e8b0110b2f1857adcafbb65484d5c003fd
Component: engine
2015-10-12 09:15:51 -07:00
b806f82f84
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
Upstream-commit: d7177c1224bee7c427aaf0b6d812c84fe5967af2
Component: engine
2015-10-12 17:49:10 +02:00
7c902d7e22
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
Upstream-commit: 08c5f52d70e539ff168d570b60b0c5d6c1a847c2
Component: engine
2015-10-12 17:24:42 +02:00
5e0687e2a2
Correct mismatched function names (UID() and Gid())
...
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 79240b9eafa08001912d5b360a654b1ad9cd1d20
Component: engine
2015-10-12 10:58:33 -04:00
bdc1bdd264
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
Upstream-commit: d5830d66e0fab58ef5543dd5b0e157b84017c3a4
Component: engine
2015-10-12 06:32:21 -04:00
eaf757b644
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e38767e197a1456458cda53b4558f56f5b6f22fa
Component: engine
2015-10-12 04:49:25 -04:00
975b04d785
use of checkers on Integration test
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
update docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 19c30447b51a474312aacccf48495abcce7c21fa
Component: engine
2015-10-11 11:31:01 +08:00
3f57348450
update pull-local#16756
...
Signed-off-by: heartlock <21521209@zju.edu.cn >
Upstream-commit: dc9dd188cf384d2ab868444bed74417a062d3592
Component: engine
2015-10-11 09:57:25 +08:00
36fdf8f132
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
Upstream-commit: ed9434c5bb64f49db442027e5e748bfbb46d0a0a
Component: engine
2015-10-10 11:38:07 -07:00
d58c684b1c
Use checkers on Integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 72269acf296ca3aac0ee637724baf75766ab4175
Component: engine
2015-10-10 21:51:15 +08:00
47d7f02c89
Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
...
update save-load-unix-test
Upstream-commit: faa448e801ffb09eb83582d3203cc9fb0eb3cbde
Component: engine
2015-10-10 14:51:18 +02:00
7e7a22b183
update save-load-unix-test
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn >
Upstream-commit: 8d98b370317d196e958f295d74bc37e596e1913a
Component: engine
2015-10-10 15:16:42 +08:00
171ab4083f
Merge pull request #16894 from diogomonica/renaming-trust-keys
...
Renaming trust keys
Upstream-commit: bf80adeee49e78e181007ff6790bf1ff2b22a72e
Component: engine
2015-10-09 23:20:54 -04:00
9b28670308
fix logic because jess is the worst
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 930b27a86bf02969600259ce3a5d3fcff10edcb5
Component: engine
2015-10-09 22:21:24 -04:00
e36eec68dc
Update integration test userns support with flag name change
...
`--root` is now `--userns-remap`
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: a85e6a4d4a5afc866b153e46e19ed3c15d3a24ec
Component: engine
2015-10-09 20:52:45 -04:00
29fa44dc8c
add test-integration-cli specifics for userns
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ea3afdad612448fc6eefcc4bdd63563be8f16946
Component: engine
2015-10-09 20:50:27 -04:00
1efd61d215
Add user namespace enable flag --userns-remap in experimental build
...
This adds the capability to turn on user namespace support when using an
experimental build Docker daemon binary using the `--userns-remap` flag.
Also documentation is added to the experimental docs.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 44e1023a93a0107d63d5400695cbbc6da498a425
Component: engine
2015-10-09 20:50:05 -04:00
f27c37e60e
Changing docs to reflect new names
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: d9a2fadb5e26cb0e8e79c260b74236a16d9a9e33
Component: engine
2015-10-09 15:13:37 -07:00
c62932e901
Merge pull request #16858 from cxxly/16756-refactor-docker_cli_login_test
...
refactor integration-cli/docker_cli_login_test.go with Assert
Upstream-commit: 1e5165275fcac2077240a22a053329c237f3695b
Component: engine
2015-10-09 23:56:24 +02:00
93c2a19d83
Add user namespace (mapping) support to the Docker engine
...
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.
Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 442b45628ee12ebd8e8bd08497896d5fa8eec4bd
Component: engine
2015-10-09 17:47:37 -04:00
1dd074a72b
Adding tests for backwards compatibility
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: 63f8db83aab9f79236df67c0be2c901f7e1b7c23
Component: engine
2015-10-09 12:20:19 -07:00
1214abd05f
Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test
...
Use Assert statement to replace condition judgment
Upstream-commit: 2491f6c95a5c893e8ffe18a9b3d6982b2cfc4bcd
Component: engine
2015-10-09 09:57:14 -07:00
a680c1ca97
Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test
...
update integration-cli/docker_cli_stats_test.go use Assert statement
Upstream-commit: a77d80d9d1ac7e807e12004707ce4b6907873fec
Component: engine
2015-10-09 09:55:41 -07:00
3b6afa7db5
Merge pull request #16843 from ZJU-SEL/16756-fix-rename-test
...
#16756 update rename test
Upstream-commit: c2df663851250d85d659d104b1a3380607249919
Component: engine
2015-10-09 11:23:46 -04:00
7d67d2acff
Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test
...
refactor docker_cli_proxy_test.go
Upstream-commit: 19ff8e09ba76cd0cabef8e5e87e4c999d7baf2d3
Component: engine
2015-10-09 15:43:39 +02:00
85749dbc68
use gocheck asserts instead of fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
Upstream-commit: 22d0be5797fd5561c999e08701e64258ff9d9536
Component: engine
2015-10-09 08:34:02 -04:00
0ead9a0735
update integration-cli/docker_cli_stats_test.go use Assert statement
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 90a81f6af256b93bf61d56ff06b84828d4d05b7a
Component: engine
2015-10-09 18:24:32 +08:00
97dbafb510
Use Assert statement to replace condition judgment
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: ee7fdbe8b9ff6ed48d183d2160c4ad5a2d713261
Component: engine
2015-10-09 17:45:28 +08:00
70579155d2
update docker_cli_login_test.go
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 75bc0c064bb9a0b06b257add956a461c89f24b9b
Component: engine
2015-10-09 15:08:01 +08:00
e67d897bad
update docker_cli_proxy_test.go
...
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 1db161768ccfc67d36034f06db36451b6cc6a214
Component: engine
2015-10-09 14:53:56 +08:00
c402376705
refactor docker_cli_proxy_test.go
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 14f43406a38b1f66ab60b5235bde4b0121eed093
Component: engine
2015-10-09 11:11:05 +08:00
824a6e360c
Merge pull request #16862 from cpuguy83/bump_runc
...
Bump runc
Upstream-commit: e7ef8633d5b098d930a6670fb0217061e1a75755
Component: engine
2015-10-08 19:09:47 -07:00
74340a2f1e
Merge pull request #16859 from diogomonica/changing-trust-server-checks
...
Changing trustServer allowed URL validation
Upstream-commit: a1d432301d08f6fbf4da792c0b35a67cfdbc770e
Component: engine
2015-10-08 18:33:35 -07:00
5d84a009ca
Changing trustServer allowed URL behavior
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: a2f9fb7777ab4ff90747a1fe67dda9046686acad
Component: engine
2015-10-08 17:47:25 -07:00
caa88a80a6
Fix exp tests cast protodriver to naivediffdriver
...
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.
The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a705ca017349b9d4c71e22de795e7dda40a5ecce
Component: engine
2015-10-08 19:44:50 -04:00
59099af0ea
Bump runc
...
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d9f5f1954cf3ba9c1f9644d7997033d5d62ab34b
Component: engine
2015-10-08 17:07:00 -04:00
510810895d
Merge pull request #16366 from MHBauer/logs-refactor
...
refactor logs to not use internal data structures
Upstream-commit: 01cd67e752aa8a2a7fa9605d5c53bc95862a4d7b
Component: engine
2015-10-08 14:05:02 -07:00
57e2d9f131
Merge pull request #13777 from cpuguy83/graphdriver_extpoints
...
Create extpoint for graphdrivers
Upstream-commit: 4c55464dd3fbbecb0e67f9b33c54f62f3982b500
Component: engine
2015-10-08 13:46:42 -07:00
90f924b006
Merge pull request #16817 from cpuguy83/explicit_volume_ls
...
Make `docker volume` behave like `docker network`
Upstream-commit: 9123f77a78c8565e83b8c42a4f14dd0c75f0af66
Component: engine
2015-10-08 11:36:51 -07:00
fe5747bb6d
Merge pull request #15693 from vdemeester/15659-image-label-filter
...
Fix #15659 : filter by label for docker images commited
Upstream-commit: 41c99cc62161376981d1c24f30c0e340124778e8
Component: engine
2015-10-08 11:14:51 -07:00
f28b4afc30
Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
...
add TestRunInValidCPUShares
Upstream-commit: 683ee205620e5e622cb13e3d4e14524b3d92dd96
Component: engine
2015-10-08 19:38:21 +02:00
11d29e39af
refactor integration-cli/docker_cli_login_test.go with Assert
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn >
Upstream-commit: 79498b1c6124ab4faabb408ef7d973ac899ad1e1
Component: engine
2015-10-08 12:43:03 -04:00
6c42b9a51f
Merge pull request #16815 from duglin/fixHelp
...
Fix help test comment to align with the code
Upstream-commit: 2b6af905faacc5eff0f1b3263974f5af12a92ed4
Component: engine
2015-10-08 09:29:32 -07:00
e67f107724
Merge pull request #16783 from Microsoft/10662-cliwait
...
Windows CI: cli_wait_test
Upstream-commit: 4a9d039721ac16b07dffb784b2c1e3f884f62459
Component: engine
2015-10-07 19:39:32 -07:00
5cf2935c37
add TestRunInValidCPUShares
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 042d08a2a89c040b2fc7d97d8cc22a6c4593e275
Component: engine
2015-10-08 10:04:51 +08:00
8c3d5b861b
refactor logs to not use internal data structures
...
- refactor to make it easier to split the api in the future
- additional tests for non existent container case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 1eecc1e7e57f3b96878df01fd32596bc485117a8
Component: engine
2015-10-07 15:44:16 -07:00
3a210ffac2
Windows CI: Fix cli_wait_test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e666dfff9b7b82b026f9d45d8a8cb0d9193f0b56
Component: engine
2015-10-07 12:57:41 -07:00
6b3f6691b5
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
80c6a28fe2
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
