github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up logging in build container

Browse Source
This commit is contained in:
Tim Hockin
2016-06-08 08:28:45 -07:00
parent ac75bd11cf
commit 4959c2c76f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/common.sh
View File

@@ -313,11 +313,11 @@ function kube::build::clean_output() {
kube::log::error "Build image not built. Cannot clean via docker build image." kube::log::error "Build image not built. Cannot clean via docker build image."
fi fi
kube::log::status "Removing data container" kube::log::status "Removing data container ${KUBE_BUILD_DATA_CONTAINER_NAME}"
"${DOCKER[@]}" rm -v "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1 || true "${DOCKER[@]}" rm -v "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1 || true
fi fi
kube::log::status "Cleaning out local _output directory" kube::log::status "Removing _output directory"
rm -rf "${LOCAL_OUTPUT_ROOT}" rm -rf "${LOCAL_OUTPUT_ROOT}"
} }
@@ -525,7 +525,7 @@ function kube::build::docker_build() {
local -r pull="${3:-true}" local -r pull="${3:-true}"
local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${context_dir}") local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${context_dir}")
kube::log::status "Building Docker image ${image}." kube::log::status "Building Docker image ${image}"
local docker_output local docker_output
docker_output=$("${build_cmd[@]}" 2>&1) || { docker_output=$("${build_cmd[@]}" 2>&1) || {
cat <<EOF >&2 cat <<EOF >&2
@@ -560,7 +560,7 @@ function kube::build::clean_images() {
function kube::build::ensure_data_container() { function kube::build::ensure_data_container() {
if ! "${DOCKER[@]}" inspect "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1; then if ! "${DOCKER[@]}" inspect "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1; then
kube::log::status "Creating data container" kube::log::status "Creating data container ${KUBE_BUILD_DATA_CONTAINER_NAME}"
local -ra docker_cmd=( local -ra docker_cmd=(
"${DOCKER[@]}" run "${DOCKER[@]}" run
"${DOCKER_DATA_MOUNT_ARGS[@]}" "${DOCKER_DATA_MOUNT_ARGS[@]}"