Darren Shepherd
43b5786001
Default storage driver to "" and let provisioner choose default
...
The storage driver will be "" by default an the provisioner must choose
their default provisioner. If the user chosen storage driver is not
supported the provisioner should return an error.
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-05-05 09:12:33 -07:00
Tianon Gravi
5e563d1708
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-05 10:11:59 -06:00
Burke Libbey
03956610e5
ino and dev must both match for a file to be identical.
...
This case is triggered frequently on ZFS.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-05 11:06:54 -04:00
Peter Salvatore
3efc083d4a
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
2015-05-05 11:03:53 -04:00
Xian Chaobo
161de6a01f
healthfilter unit test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-05 22:23:46 +08:00
Lei Jitang
0e08e9aca1
Add support --net=container with --mac-address,--add-host error out
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-05 19:28:40 +08:00
Lei Jitang
101f982059
Refactor the code of checking conflict option with netmode.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-05 19:23:18 +08:00
Xian Chaobo
a313f46bb8
add test when container is not running
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-05 04:55:17 -04:00
Xian Chaobo
28043dfd7d
check status code in exec
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-05 04:45:29 -04:00
Qiang Huang
5a6db4fd44
a few cleanups for client output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-05 15:59:17 +08:00
Sankar சங்கர்
c7ca73c830
Added information about mailing lists
...
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com >
2015-05-05 13:21:24 +05:30
Andrea Luzzardi
1187069407
integration: fix nodes patterns in docker_swarm info
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-05 00:20:22 -07:00
Adria Casas
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
2015-05-05 08:54:28 +02:00
Andrea Luzzardi
b7413d3138
integration helpers: fix the wait for docker join
...
It used to output `[: -eq: unary operator expected` since the grep
command didn't give any output, therefore generating a syntax error.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:52:34 -07:00
Andrea Luzzardi
389da48e5e
integration: skip dependency tests
...
They rely on docker inspect --format and it's currently broken on docker
master.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:22:46 -07:00
Andrea Luzzardi
2605eff5fc
discovery integration: fix for docker master
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:20:42 -07:00
Andrea Luzzardi
88033393ba
api integration: Fixes for docker master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Andrea Luzzardi
5d10f47b32
integration helpers: move the docker_ functions together
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Andrea Luzzardi
b4af7acd83
integration: Run tests using docker master.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Andrea Luzzardi
3bb37e671a
integration runner: Use the same CLI as the one available in the image.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Andrea Luzzardi
2ba8acbaca
integration: Ensure the client and server are running the same version.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Andrea Luzzardi
86bf53a504
integration: Support using a different CLI.
...
- `docker` will now use the CLI defined in $DOCKER_BINARY
- In order to communicate with the host docker, one must use
`docker_host`
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 23:17:29 -07:00
Tibor Vass
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
Tibor Vass
f838d44283
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
2015-05-04 22:25:13 -07:00
Andrea Luzzardi
fdf74cef2a
Merge pull request #465 from chanwit/test-create-cluster-on-hub
...
integration: add a test to verify creating cluster on hub
2015-05-04 22:00:37 -07:00
Chanwit Kaewkasi
6ecf51f458
add integration test for token discovery
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-05-05 11:44:47 +07:00
Chanwit Kaewkasi
89fe217e12
use retry to wait for swarm join
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-05-05 11:44:47 +07:00
Xian Chaobo
35026de4c4
bug fix
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-05 12:31:09 +08:00
Andrea Luzzardi
cecfa12a59
Merge pull request #713 from aluzzardi/integration-skip-broken
...
integration: Fix tests running in Jenkins
2015-05-04 20:45:14 -07:00
Andrea Luzzardi
4b3bc9b35b
integration: Fix tests in jenkins.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 20:35:56 -07:00
Stephen Day
dd58ffe6ed
Merge pull request #410 from RichardScothern/driver-context
...
Add golang/x/net/context.Context to storage driver method calls
2015-05-04 19:18:30 -07:00
Dave Henderson
6d750d04f1
Fixing panic when d.deviceConfig is nil
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-05-04 22:13:50 -04:00
Nathan LeClaire
23f071c76f
Fix integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-05-04 19:01:29 -07:00
Victor Vieux
30f88f9777
Merge pull request #710 from vieux/remove_unused_fields
...
remove unused fields from node
2015-05-04 19:00:28 -07:00
Evan Hazlett
17ae8ff3bf
bump for dev 0.3.0 version
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-05-04 18:16:58 -07:00
Evan Hazlett
e4b6ff1ae9
Merge pull request #1103 from nathanleclaire/active_based_on_env
...
Read active host from DOCKER_HOST instead of from file
2015-05-04 18:13:48 -07:00
Fred Lifton
677b962642
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
2015-05-04 17:53:37 -07:00
Yuan Sun
6e8aa4e588
Verify the no-trunc option for the search operation.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-05-05 08:51:13 +08:00
Alexandre Beslic
3338a12295
Merge pull request #712 from aluzzardi/integration-aufs
...
integration: Use aufs by default.
2015-05-04 17:39:01 -07:00
Sven Dowideit
bba5fd8caa
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-05 00:38:41 +00:00
Alexandre Beslic
ebcf4f7272
Merge pull request #711 from aluzzardi/integration-fix-dockerfile
...
integration: Added missing dependency to Dockerfile.
2015-05-04 17:33:51 -07:00
Andrea Luzzardi
6df673372f
integration: Use aufs by default.
...
The problem has been fixed in the dind images.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 17:29:00 -07:00
Andrea Luzzardi
a2862280f1
integration: Added missing dependency to Dockerfile.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 17:25:02 -07:00
Victor Vieux
9dfd82e5ff
remove unused fields from node
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-04 16:56:55 -07:00
Nathan LeClaire
c602e69448
Read active host from DOCKER_HOST instead of from file
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-05-04 16:29:04 -07:00
John Howard
1c3b697d60
Windows: Fix filepath vs path in image.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 16:23:17 -07:00
Fred Lifton
77183ed760
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
2015-05-04 16:23:08 -07:00
John Howard
3b2c8f69fd
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 16:18:23 -07:00
Arnaud Porterie
44de5fecce
Add DOCKER_USERLANDPROXY test variable
...
Add an convenient way to switch --userland-proxy on and off in
integration tests.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-04 16:07:51 -07:00
Arnaud Porterie
f42348e18f
Add --userland-proxy daemon flag
...
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.
Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-04 16:07:45 -07:00