b0cbc02283
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
2015-10-12 10:03:18 -07:00
2d1414e8b0
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
2015-10-12 09:15:51 -07:00
d7177c1224
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
2015-10-12 17:49:10 +02:00
08c5f52d70
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
2015-10-12 17:24:42 +02:00
79240b9eaf
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)
2015-10-12 10:58:33 -04:00
d5830d66e0
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2015-10-12 06:32:21 -04:00
e38767e197
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-12 04:49:25 -04:00
19c30447b5
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>
2015-10-11 11:31:01 +08:00
dc9dd188cf
update pull-local#16756
...
Signed-off-by: heartlock <21521209@zju.edu.cn>
2015-10-11 09:57:25 +08:00
ed9434c5bb
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
2015-10-10 11:38:07 -07:00
72269acf29
Use checkers on Integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-10 21:51:15 +08:00
faa448e801
Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
...
update save-load-unix-test
2015-10-10 14:51:18 +02:00
8d98b37031
update save-load-unix-test
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 15:16:42 +08:00
bf80adeee4
Merge pull request #16894 from diogomonica/renaming-trust-keys
...
Renaming trust keys
2015-10-09 23:20:54 -04:00
930b27a86b
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>
2015-10-09 22:21:24 -04:00
a85e6a4d4a
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)
2015-10-09 20:52:45 -04:00
ea3afdad61
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>
2015-10-09 20:50:27 -04:00
44e1023a93
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)
2015-10-09 20:50:05 -04:00
d9a2fadb5e
Changing docs to reflect new names
...
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-09 15:13:37 -07:00
1e5165275f
Merge pull request #16858 from cxxly/16756-refactor-docker_cli_login_test
...
refactor integration-cli/docker_cli_login_test.go with Assert
2015-10-09 23:56:24 +02:00
442b45628e
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)
2015-10-09 17:47:37 -04:00
63f8db83aa
Adding tests for backwards compatibility
...
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-09 12:20:19 -07:00
2491f6c95a
Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test
...
Use Assert statement to replace condition judgment
2015-10-09 09:57:14 -07:00
a77d80d9d1
Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test
...
update integration-cli/docker_cli_stats_test.go use Assert statement
2015-10-09 09:55:41 -07:00
c2df663851
Merge pull request #16843 from ZJU-SEL/16756-fix-rename-test
...
#16756 update rename test
2015-10-09 11:23:46 -04:00
19ff8e09ba
Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test
...
refactor docker_cli_proxy_test.go
2015-10-09 15:43:39 +02:00
22d0be5797
use gocheck asserts instead of fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2015-10-09 08:34:02 -04:00
90a81f6af2
update integration-cli/docker_cli_stats_test.go use Assert statement
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-09 18:24:32 +08:00
ee7fdbe8b9
Use Assert statement to replace condition judgment
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-09 17:45:28 +08:00
75bc0c064b
update docker_cli_login_test.go
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-09 15:08:01 +08:00
1db161768c
update docker_cli_proxy_test.go
...
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-09 14:53:56 +08:00
14f43406a3
refactor docker_cli_proxy_test.go
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-09 11:11:05 +08:00
e7ef8633d5
Merge pull request #16862 from cpuguy83/bump_runc
...
Bump runc
2015-10-08 19:09:47 -07:00
a1d432301d
Merge pull request #16859 from diogomonica/changing-trust-server-checks
...
Changing trustServer allowed URL validation
2015-10-08 18:33:35 -07:00
a2f9fb7777
Changing trustServer allowed URL behavior
...
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-08 17:47:25 -07:00
a705ca0173
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>
2015-10-08 19:44:50 -04:00
d9f5f1954c
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>
2015-10-08 17:07:00 -04:00
01cd67e752
Merge pull request #16366 from MHBauer/logs-refactor
...
refactor logs to not use internal data structures
2015-10-08 14:05:02 -07:00
4c55464dd3
Merge pull request #13777 from cpuguy83/graphdriver_extpoints
...
Create extpoint for graphdrivers
2015-10-08 13:46:42 -07:00
9123f77a78
Merge pull request #16817 from cpuguy83/explicit_volume_ls
...
Make `docker volume` behave like `docker network`
2015-10-08 11:36:51 -07:00
41c99cc621
Merge pull request #15693 from vdemeester/15659-image-label-filter
...
Fix #15659 : filter by label for docker images commited
2015-10-08 11:14:51 -07:00
683ee20562
Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
...
add TestRunInValidCPUShares
2015-10-08 19:38:21 +02:00
79498b1c61
refactor integration-cli/docker_cli_login_test.go with Assert
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-08 12:43:03 -04:00
2b6af905fa
Merge pull request #16815 from duglin/fixHelp
...
Fix help test comment to align with the code
2015-10-08 09:29:32 -07:00
4a9d039721
Merge pull request #16783 from Microsoft/10662-cliwait
...
Windows CI: cli_wait_test
2015-10-07 19:39:32 -07:00
042d08a2a8
add TestRunInValidCPUShares
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-10-08 10:04:51 +08:00
1eecc1e7e5
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>
2015-10-07 15:44:16 -07:00
e666dfff9b
Windows CI: Fix cli_wait_test
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-07 12:57:41 -07:00
8e31036816
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
2015-10-07 10:44:58 -07:00
a1c373197f
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
2015-10-07 10:40:32 -07:00
Arnaud Porterie
Alexander Morozov
Antonio Murdaca
Phil Estes
Hao Zhang
Lei Jitang
Xiaoxu Chen
heartlock
Hu Keping
Vincent Demeester
xlgao-zju
Phil Estes
Jessica Frazelle
Diogo Monica
Jess Frazelle
Brian Goff
Yuan Sun
Morgan Bauer
John Howard