diff options
author | fahlke <alexander.fahlke@gmail.com> | 2017-07-07 07:26:11 +0200 |
---|---|---|
committer | Ben Kochie <superq@gmail.com> | 2017-07-07 07:26:11 +0200 |
commit | a89d72b5ebcdf2e757641e4ffe4d28b4094f4222 (patch) | |
tree | 9cada3bcdcf9db0bb5b8733c3111086764156847 /test_image.sh | |
parent | 8d902762839282f0c2bf3b77fe33cf5fbfa1d8df (diff) | |
download | prometheus_node_collector-a89d72b5ebcdf2e757641e4ffe4d28b4094f4222.tar.bz2 prometheus_node_collector-a89d72b5ebcdf2e757641e4ffe4d28b4094f4222.tar.xz prometheus_node_collector-a89d72b5ebcdf2e757641e4ffe4d28b4094f4222.zip |
Resolves prometheus/node_exporter#585 (#586)
* Resolves prometheus/node_exporter#585
* - removed 'docker rm' as it is not allowed on CircleCI
See discussion: https://discuss.circleci.com/t/docker-error-removing-intermediate-container/70
Diffstat (limited to 'test_image.sh')
-rwxr-xr-x | test_image.sh | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/test_image.sh b/test_image.sh index c23523a..4b47854 100755 --- a/test_image.sh +++ b/test_image.sh | |||
@@ -4,20 +4,27 @@ set -exo pipefail | |||
4 | docker_image=$1 | 4 | docker_image=$1 |
5 | port=$2 | 5 | port=$2 |
6 | 6 | ||
7 | container_id='' | ||
8 | |||
7 | wait_start() { | 9 | wait_start() { |
8 | for in in {1..10}; do | 10 | for in in {1..10}; do |
9 | if /usr/bin/curl -s -m 5 -f "http://localhost:${port}/metrics" > /dev/null ; then exit 0 ; | 11 | if /usr/bin/curl -s -m 5 -f "http://localhost:${port}/metrics" > /dev/null; then |
10 | else | 12 | docker_cleanup |
11 | sleep 1 | 13 | exit 0 |
12 | fi | 14 | else |
15 | sleep 1 | ||
16 | fi | ||
13 | done | 17 | done |
14 | 18 | ||
15 | exit 1 | 19 | exit 1 |
16 | |||
17 | } | 20 | } |
18 | 21 | ||
19 | docker_start() { | 22 | docker_start() { |
20 | docker run -d -p "${port}":"${port}" "${docker_image}" | 23 | container_id=$(docker run -d -p "${port}":"${port}" "${docker_image}") |
24 | } | ||
25 | |||
26 | docker_cleanup() { | ||
27 | docker kill "${container_id}" | ||
21 | } | 28 | } |
22 | 29 | ||
23 | if [[ "$#" -ne 2 ]] ; then | 30 | if [[ "$#" -ne 2 ]] ; then |