Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean out _output directory from within docker. #1737

Merged
merged 1 commit into from
Oct 10, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,14 @@ function kube::build::is_osx() {

function kube::build::clean_output() {
# Clean out the output directory if it exists.
if kube::build::is_osx ; then
if kube::build::build_image_built ; then
echo "+++ Cleaning out boot2docker _output/"
kube::build::run_build_command rm -rf "${REMOTE_OUTPUT_ROOT}" || true
else
echo "!!! Build image not built. Assuming boot2docker _output is clean."
fi
if kube::build::build_image_built ; then
echo "+++ Cleaning out _output/ via docker build image"
kube::build::run_build_command rm -rf '${REMOTE_OUTPUT_ROOT}/*'
else
echo "!!! Build image not built. Cannot clean via docker build image."
fi

echo "+++ Cleaning out _output directory"
echo "+++ Cleaning out local _output directory"
rm -rf "${LOCAL_OUTPUT_ROOT}"
}

Expand Down