Remove --rm from docker run commands
Trying to avoid "Failed to destroy btrfs snapshot" errors on CircleCI
This commit is contained in:
parent
6e7ff3451b
commit
5c6a63568d
3 changed files with 5 additions and 5 deletions
|
@ -62,7 +62,7 @@ load test_helpers
|
||||||
-v /etc/nginx/certs/ \
|
-v /etc/nginx/certs/ \
|
||||||
nginx:latest
|
nginx:latest
|
||||||
assert_success
|
assert_success
|
||||||
run retry 5 1s docker run --rm appropriate/curl --silent --fail --head http://$(docker_ip bats-nginx)/
|
run retry 5 1s docker run appropriate/curl --silent --fail --head http://$(docker_ip bats-nginx)/
|
||||||
assert_output -l 0 $'HTTP/1.1 200 OK\r'
|
assert_output -l 0 $'HTTP/1.1 200 OK\r'
|
||||||
|
|
||||||
# WHEN docker-gen runs on our docker host
|
# WHEN docker-gen runs on our docker host
|
||||||
|
|
|
@ -56,5 +56,5 @@ function docker_tcp {
|
||||||
--expose 2375 \
|
--expose 2375 \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
rancher/socat-docker
|
rancher/socat-docker
|
||||||
docker run --rm --link "$container_name:docker" docker version
|
docker run --link "$container_name:docker" docker version
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,7 @@ function curl_container {
|
||||||
local -r container=$1
|
local -r container=$1
|
||||||
local -r path=$2
|
local -r path=$2
|
||||||
shift 2
|
shift 2
|
||||||
docker run --rm appropriate/curl --silent \
|
docker run appropriate/curl --silent \
|
||||||
--connect-timeout 5 \
|
--connect-timeout 5 \
|
||||||
--max-time 20 \
|
--max-time 20 \
|
||||||
"$@" \
|
"$@" \
|
||||||
|
@ -123,7 +123,7 @@ function prepare_web_container {
|
||||||
# THEN querying directly port works
|
# THEN querying directly port works
|
||||||
IFS=$' \t\n' # See https://github.com/sstephenson/bats/issues/89
|
IFS=$' \t\n' # See https://github.com/sstephenson/bats/issues/89
|
||||||
for port in $ports; do
|
for port in $ports; do
|
||||||
run retry 5 1s docker run --rm appropriate/curl --silent --fail http://$(docker_ip $container_name):$port/data
|
run retry 5 1s docker run appropriate/curl --silent --fail http://$(docker_ip $container_name):$port/data
|
||||||
assert_output "answer from port $port"
|
assert_output "answer from port $port"
|
||||||
done
|
done
|
||||||
}
|
}
|
Reference in a new issue