From 5c6a63568dfb32e53d8a3dee5a2c65c70090bb15 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Mon, 12 Oct 2015 20:59:53 -0700 Subject: [PATCH] Remove --rm from docker run commands Trying to avoid "Failed to destroy btrfs snapshot" errors on CircleCI --- test/docker.bats | 2 +- test/lib/docker_helpers.bash | 2 +- test/test_helpers.bash | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/docker.bats b/test/docker.bats index d5fde7c..f4ec665 100644 --- a/test/docker.bats +++ b/test/docker.bats @@ -62,7 +62,7 @@ load test_helpers -v /etc/nginx/certs/ \ nginx:latest 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' # WHEN docker-gen runs on our docker host diff --git a/test/lib/docker_helpers.bash b/test/lib/docker_helpers.bash index c60c222..ae93409 100644 --- a/test/lib/docker_helpers.bash +++ b/test/lib/docker_helpers.bash @@ -56,5 +56,5 @@ function docker_tcp { --expose 2375 \ -v /var/run/docker.sock:/var/run/docker.sock \ rancher/socat-docker - docker run --rm --link "$container_name:docker" docker version + docker run --link "$container_name:docker" docker version } diff --git a/test/test_helpers.bash b/test/test_helpers.bash index d8e7496..9e4690c 100644 --- a/test/test_helpers.bash +++ b/test/test_helpers.bash @@ -66,7 +66,7 @@ function curl_container { local -r container=$1 local -r path=$2 shift 2 - docker run --rm appropriate/curl --silent \ + docker run appropriate/curl --silent \ --connect-timeout 5 \ --max-time 20 \ "$@" \ @@ -123,7 +123,7 @@ function prepare_web_container { # THEN querying directly port works IFS=$' \t\n' # See https://github.com/sstephenson/bats/issues/89 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" done -} \ No newline at end of file +}