From a94e8a3d5690792702020284772a04c6d56dece3 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Mon, 10 Nov 2014 12:46:07 -0800 Subject: [PATCH] Clean out data volumes for real --- build/common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/common.sh b/build/common.sh index 65dc8469a26..a211813c30e 100644 --- a/build/common.sh +++ b/build/common.sh @@ -173,7 +173,7 @@ function kube::build::clean_output() { fi echo "+++ Removing data container" - docker rm "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1 || true + docker rm -v "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1 || true echo "+++ Cleaning out local _output directory" rm -rf "${LOCAL_OUTPUT_ROOT}" @@ -406,13 +406,13 @@ function kube::build::run_build_command() { docker run "${docker_run_opts[@]}" "${KUBE_BUILD_IMAGE}") # Remove the container if it is left over from some previous aborted run - docker rm "${KUBE_BUILD_CONTAINER_NAME}" >/dev/null 2>&1 || true + docker rm -v "${KUBE_BUILD_CONTAINER_NAME}" >/dev/null 2>&1 || true "${docker_cmd[@]}" "$@" # Remove the container after we run. '--rm' might be appropriate but it # appears that sometimes it fails. See # https://github.com/docker/docker/issues/3968 - docker rm "${KUBE_BUILD_CONTAINER_NAME}" >/dev/null 2>&1 || true + docker rm -v "${KUBE_BUILD_CONTAINER_NAME}" >/dev/null 2>&1 || true } # Test if the output directory is remote (and can only be accessed through