1
0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00

set -pkgdir during build, allows build-cross.sh to be run as non-root user

This commit is contained in:
Jim Minter
2017-01-06 11:24:15 +00:00
parent 483683e640
commit 4c52163869

View File

@@ -18,6 +18,7 @@ S2I_ROOT=$(
S2I_OUTPUT_SUBPATH="${S2I_OUTPUT_SUBPATH:-_output/local}"
S2I_OUTPUT="${S2I_ROOT}/${S2I_OUTPUT_SUBPATH}"
S2I_OUTPUT_BINPATH="${S2I_OUTPUT}/bin"
S2I_OUTPUT_PKGDIR="${S2I_OUTPUT}/pkgdir"
S2I_LOCAL_BINPATH="${S2I_OUTPUT}/go/bin"
S2I_LOCAL_RELEASEPATH="${S2I_OUTPUT}/releases"
@@ -90,6 +91,7 @@ s2i::build::build_binaries() {
s2i::build::set_platform_envs "${platform}"
echo "++ Building go targets for ${platform}:" "${targets[@]}"
go install "${goflags[@]:+${goflags[@]}}" \
-pkgdir "${S2I_OUTPUT_PKGDIR}" \
-ldflags "${version_ldflags}" \
"${binaries[@]}"
s2i::build::unset_platform_envs "${platform}"