From 368fb2225c303f11ae6582a706718587fcdc44bf Mon Sep 17 00:00:00 2001 From: fmeng Date: Fri, 29 Jan 2016 10:45:50 +0800 Subject: [PATCH] fix sed error in build/common.sh --- build/common.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/common.sh b/build/common.sh index 196d9602a83..b653ea298cd 100755 --- a/build/common.sh +++ b/build/common.sh @@ -472,7 +472,11 @@ function kube::build::build_image() { kube::version::save_version_vars "${build_context_dir}/kube-version-defs" cp build/build-image/Dockerfile ${build_context_dir}/Dockerfile - sed -i "s/KUBE_BUILD_IMAGE_CROSS/${KUBE_BUILD_IMAGE_CROSS}/" ${build_context_dir}/Dockerfile + if kube::build::is_osx; then + sed -i "" "s/KUBE_BUILD_IMAGE_CROSS/${KUBE_BUILD_IMAGE_CROSS}/" ${build_context_dir}/Dockerfile + else + sed -i "s/KUBE_BUILD_IMAGE_CROSS/${KUBE_BUILD_IMAGE_CROSS}/" ${build_context_dir}/Dockerfile + fi # We don't want to force-pull this image because it's based on a local image # (see kube::build::build_image_cross), not upstream. kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${build_context_dir}" 'false'