diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2016-08-12 13:43:13 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2016-08-12 13:43:13 +0200 |
| commit | 37194d1efd8b575c188eadc1b2054ece1bfc5723 (patch) | |
| tree | 07b4573048d69023878d788226a05a6f99bab3ad /node-admin | |
| parent | 9338f66447ce658fe7701b9a4f607bb21ee8fa59 (diff) | |
Upgraded docker, downgraded docker API
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/pom.xml | 2 | ||||
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index f668194f457..5a0083d82a3 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java index f17853082ef..b454b24db3b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java @@ -116,6 +116,7 @@ public class DockerImpl implements Docker { .withDockerHost(config.uri().replace("https", "tcp")) .withDockerTlsVerify(true) .withCustomSslConfig(new VespaSSLConfig(config)) + .withApiVersion("1.23") .build()) .withDockerCmdExecFactory( new JerseyDockerCmdExecFactory() |