Commit Graph

2079 Commits

Author SHA1 Message Date
d58c97726f Merge pull request #17073 from ZJaffee/api_events_test
Cleaned up integration-cli/docker_api_events_test.go
Upstream-commit: 1052ff674cf41b175ce5ec764b489ff843675dbf
Component: engine
2015-10-16 00:22:29 +02:00
8971270851 Cleaned up integration-cli/docker_api_logs_test.go
Signed-off-by: Zachary Jaffee <zij@case.edu>
Upstream-commit: 7aab43e8d4e71ea056d635c5659d32f2efbb3a3f
Component: engine
2015-10-15 13:33:31 -04:00
0794c030b2 Cleaned up integration-cli/docker_api_events_test.go
Signed-off-by: Zachary Jaffee <zij@case.edu>
Upstream-commit: 176d8c5a144a961b2d6590ae70279d3fc6e3ef31
Component: engine
2015-10-15 12:40:36 -04:00
7cb16e93cd Merge pull request #17004 from echo33/docker_cli_restart_test
use of checkers on docker_cli_restart_test.go
Upstream-commit: 0f00c36d65101791c862d9cac0793336787c1667
Component: engine
2015-10-15 13:31:05 +02:00
cce8b7e14d use of checkers on docker_cli_restart_test.go
Signed-off-by: weiyan <weiyan3@huawei.com>
Upstream-commit: 196af472a6b423ed0547c0fb080aa548cd077efd
Component: engine
2015-10-15 16:35:03 +08:00
d7e9503657 Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
update TestRunWithBlkioInvalidWeight
Upstream-commit: e4dadeed8860dbe748e7257ea13c792a8d82073b
Component: engine
2015-10-15 08:34:52 +02:00
9be0d4300b Merge pull request #16968 from MHBauer/network-refactor
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
2015-10-14 17:48:08 +02:00
06e65682ca use of checkers on docker_cli_v2_only.go
Signed-off-by: weiyan <weiyan3@huawei.com>
Upstream-commit: 899ca94ce8d78229195213d1558917eb98cbc7de
Component: engine
2015-10-14 20:10:34 +08:00
e864e1b06f update TestRunWithBlkioInvalidWeight
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: d550fbb80e0ecf4b10c14e8b06bc8606101696dd
Component: engine
2015-10-14 16:20:52 +08:00
182a4806ba refactor use of container struct from daemon
- do existence check instead of get container
 - new connect method on daemon.
 - cli network disconnect integration test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
2015-10-13 16:34:28 -07:00
332d97bdef update tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
2015-10-13 15:52:14 -07:00
50f40c819d daemon: execdriver: lxc: fix cgroup paths
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: cfcddefacd125af4d909df653bccc8e3089a03b0
Component: engine
2015-10-13 14:46:59 -07:00
1a998995c2 daemon: execdriver: lxc: fix set memory swap
On LXC memory swap was only set to memory_limit*2 even if a value for
memory swap was provided. This patch fix this behavior to be the same
as the native driver and set correct memory swap in the template.
Also add a test specifically for LXC but w/o adding a new test
requirement.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 06f0d03cede5f6cdaca87f6b786555b023d5286f
Component: engine
2015-10-13 14:46:59 -07:00
0e3861a2d2 Merge pull request #16910 from mavenugo/ipam
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
2015-10-13 14:41:19 -07:00
019ffb819f Merge pull request #15796 from azurezk/add-size-to-inspect
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
7a285e518e IPAM API & UX
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cc6aece1fdefbc10638fe9e462a15608c6093115
Component: engine
2015-10-13 11:03:03 -07:00
2cd0b95af5 Docker side changes for the newly introduced IPAM driver
* Made use of IPAM driver primitives for legacy IP configurations
* Replaced custom Generics with backend labels

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0f351ce3643a97d4b6af0021826b851f9ba41967
Component: engine
2015-10-13 10:52:59 -07:00
bdf64e8384 Merge pull request #16956 from runcom/16665-fix-inspect-Config-api120
Return old Config fields for API < v1.20
Upstream-commit: 0bc748bba33a00c20cedf24786f772536177725c
Component: engine
2015-10-13 09:08:26 -07:00
bc9fb8d7f3 Fix Config.Cpuset from API < 1.20
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 8c63ce4f6b78bd1d87c92ecfbcc20ccfd80f7d63
Component: engine
2015-10-13 09:09:05 +02:00
9b2f66b864 Merge pull request #16958 from tonistiigi/digest-collision
Make sure tags and digests don’t collide
Upstream-commit: 9a13c2dc79cc868ba3a863137ba27297314167e4
Component: engine
2015-10-12 15:45:34 -07:00
939faf2998 Merge pull request #16009 from azurezk/vol-create-conflict-option
volume create error on conflict option
Upstream-commit: df79536769eab04a7f1c618f9a390b36be6c53be
Component: engine
2015-10-12 15:27:36 -07:00
bcec6f94b2 Make sure tags and digests don’t collide
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.

Reverts #14664

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d08ca5c2b65d442f37424957e53d81f96356d12c
Component: engine
2015-10-12 14:20:11 -07:00
eb67a37877 Calculate hash based image IDs on pull
Generate a hash chain involving the image configuration, layer digests,
and parent image hashes. Use the digests to compute IDs for each image
in a manifest, instead of using the remotely specified IDs.

To avoid breaking users' caches, check for images already in the graph
under old IDs, and avoid repulling an image if the version on disk under
the legacy ID ends up with the same digest that was computed from the
manifest for that image.

When a calculated ID already exists in the graph but can't be verified,
continue trying SHA256(digest) until a suitable ID is found.

"save" and "load" are not changed to use a similar scheme. "load" will
preserve the IDs present in the tar file.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 504e67b867865a2835e8002c01087a2cfd7bfd0e
Component: engine
2015-10-12 10:51:28 -07:00
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
6841b07f52 volume create error on conflict option
Signed-off-by: Kun Zhang <zkazure@gmail.com>
Upstream-commit: 0ff3123eba071166def8072d8c7f3aa9afa0b56f
Component: engine
2015-10-12 11:16:39 +08: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
9375e8c909 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08: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