Commit Graph

124 Commits

Author SHA1 Message Date
Morgan Bauer
2de0f86b5f Merge pull request #1998 from dongluochen/HostnameUpdate
Docker changes hostname/domain in container config
2016-03-18 19:53:41 -07:00
Dong Chen
951c2d1cca Docker engine updates hostname/domainname.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-18 16:18:01 -07:00
Sun Hongliang
01fc95fe31 classify whether constraint error or affinity error
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-18 21:51:31 +08:00
Dongluo Chen
85f6d57f21 Merge pull request #1972 from vieux/pass-host-config
HostConfig for /start endpoint
2016-03-16 17:19:29 -07:00
Victor Vieux
56affa1ada fix image matching via id
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-16 15:12:56 -07:00
Victor Vieux
b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Xian Chaobo
e7065eabf7 add support ps node filter
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-11 10:31:33 +08:00
Alexandre Beslic
a348207f18 Merge pull request #1835 from jimmyxian/add-support-some-run-option
Add support some run options
2016-03-03 10:12:17 -08:00
Xian Chaobo
ba4ad74de3 add support some run options
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-03 19:53:47 +08:00
Victor Vieux
22fedf0db0 support docker run --net <node>/<network>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 13:13:31 -08:00
Victor Vieux
f3a1d58fe3 Revert "Testcase start container with hostconfig"
This reverts commit 3dff7aa96a.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:51 -08:00
Sverre Boschman
3dff7aa96a Testcase start container with hostconfig
Signed-off-by: Sverre Boschman <s.r.boschman@gmail.com>
2016-02-17 11:08:29 +01:00
Victor Vieux
220604d6ef fix flacky before tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-10 01:52:29 -08:00
Victor Vieux
24fe2c04e5 support docker network ls --filter type=XXX
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 15:57:53 -08:00
Victor Vieux
97749f3f2d add docker run --net-alias, docker network connect --ip and docker network connect --alias tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 06:04:55 -08:00
Victor Vieux
9f9aba623f update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 03:04:17 -08:00
Victor Vieux
9abd727c52 add test for run --ip
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 01:16:48 -08:00
Victor Vieux
aa028f4d09 Host Down containers in ps requires -a
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 11:28:19 -08:00
Victor Vieux
f3a1027bbe update docker info
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Victor Vieux
cc4eea83da Merge pull request #1669 from dongluochen/dockerUpdateCmd
Support 'docker update' command
2016-01-22 17:43:41 -08:00
Dong Chen
f42f5fa3d4 Support 'docker update' command.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-22 17:10:22 -08:00
Victor Vieux
1225eddc79 allow engine/name support in volumes
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 17:40:53 -08:00
Victor Vieux
04fb48d27a support 1.10 events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-15 19:35:04 -08:00
Xian Chaobo
1fef59f738 fresh image when receive commit event
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-01-08 17:25:30 +08:00
Victor Vieux
5daaecdaa1 do not save image affinity on reschedule
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-05 10:29:45 -08:00
Xian Chaobo
ef8fb1cbc8 Merge pull request #1579 from vieux/fix_api_code
fix status code when container found on unhealthy node
2016-01-06 09:30:25 +08:00
Victor Vieux
94aad7d423 fix plugin not found case in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 22:06:12 -08:00
Victor Vieux
0f93c86398 fix test ps --before
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 17:36:51 -08:00
Victor Vieux
ea5b2290ed fix soft affinities/constraints
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-04 15:59:51 -08:00
Victor Vieux
c11d4fe82c fix stable tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-22 00:03:59 -08:00
Victor Vieux
d00c23094b remove sleep from tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-17 16:49:54 -08:00
Dong Chen
82d16226e6 rebase and update test case.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-12-15 19:13:03 -08:00
Victor Vieux
cdd42a5c6b display all the containers that are part of a global network on inspect
update godeps

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-12-15 17:48:35 -08:00
Victor Vieux
4b33656bb4 return proper error for inspect and proxy on unhealthy node
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-12-10 20:05:17 -08:00
Alexandre Beslic
44d96a6185 integration: fix --kernel-memory value set too low
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-03 00:28:00 -08:00
Xian Chaobo
b85c2a65c6 fix CI
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-11-26 10:49:08 +08:00
Xian Chaobo
bea12ab8ab add support do with image digest
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-11-11 12:11:08 +08:00
Victor Vieux
c286a183b3 fix diff test
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 18:03:29 -08:00
Victor Vieux
3c397e5b96 update test name
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-02 16:32:43 -08:00
Xian Chaobo
5aae69fc58 add integraion test for rmi -f with image tag
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-31 10:36:02 +08:00
Victor Vieux
1c1a99038e ensure docker network inspect is the same as the engine one
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-30 00:38:42 -07:00
Victor Vieux
d2c5446ea0 Merge pull request #1340 from jimmyxian/volume-driver
Move VolumeDriver to HostConfig
2015-10-28 15:28:53 -07:00
Xian Chaobo
588c29c3cc move VolumeDriver to HostConfig
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-28 10:58:24 +08:00
Daniel Nephin
e001980b5c Add filter by image name support to /images/json
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 11:00:37 -04:00
Victor Costan
e32b3211ae Swarm filters support in image building.
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.

Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-23 14:24:42 -04:00
Xian Chaobo
c947d5be69 add support some run options
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-22 09:14:23 +08:00
Alexandre Beslic
50671ab6f3 Integration test for regression with parallel docker run when specifying a port
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-21 02:59:04 -07:00
Victor Vieux
07a102adc8 fix tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:46:38 -07:00
Victor Vieux
bef2892cee Merge pull request #1271 from jimmyxian/fix-reschedule-with-soft-affinity
Do not try retry with soft-image-affinity when have node constraint
2015-10-15 13:52:29 -07:00
Victor Vieux
d000d70238 update libnetwork
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:06:21 -07:00