github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix build on OS X when GNU sed is present.

Browse Source 
See #20147, which fixed it when system default BSD sed was present but did not account for possibiliyt of GNU sed on OS X.
This commit is contained in:
Lorrin Nelson 2016-07-07 10:52:00 -07:00
parent 939b98481e
commit d0e36819a4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/common.sh
View File

@ -242,11 +242,15 @@ function kube::build::is_osx() {
[[ "$(uname)" == "Darwin" ]] [[ "$(uname)" == "Darwin" ]]
} }
function kube::build::is_gnu_sed() {
[[ $(sed --version 2>&1) == *GNU* ]]
}
function kube::build::update_dockerfile() { function kube::build::update_dockerfile() {
if kube::build::is_osx; then if kube::build::is_gnu_sed; then
sed_opts=(-i '')
else
sed_opts=(-i) sed_opts=(-i)
else
sed_opts=(-i '')
fi fi
sed "${sed_opts[@]}" "s/KUBE_BUILD_IMAGE_CROSS_TAG/${KUBE_BUILD_IMAGE_CROSS_TAG}/" "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile" sed "${sed_opts[@]}" "s/KUBE_BUILD_IMAGE_CROSS_TAG/${KUBE_BUILD_IMAGE_CROSS_TAG}/" "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
} }