Merge pull request #97 from nosqlbench/testbranch

Testbranch
This commit is contained in:
Jonathan Shook 2020-03-25 14:35:26 -05:00 committed by GitHub
commit 2d9adf297f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -4,8 +4,9 @@ on:
push:
branches:
- master
tags-ignore:
- invoke-release
- testbranch
tags:
- '!invoke-release'
jobs:
build:

View File

@ -57,8 +57,8 @@ public class DockerMetricsHelper {
System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR);
this.config = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(DOCKER_HOST_ADDR).build();
DockerCmdExecFactory dockerCmdExecFactory = new OkHttpDockerCmdExecFactory()
.withReadTimeout(1000)
.withConnectTimeout(1000);
.withReadTimeout(10000)
.withConnectTimeout(10000);
// DockerCmdExecFactory dockerCmdExecFactory = new JerseyDockerCmdExecFactory()
// .withReadTimeout(1000)