common.sh (kubernetes-1.18.14) | : | common.sh (kubernetes-1.18.15) | ||
---|---|---|---|---|
skipping to change at line 573 | skipping to change at line 573 | |||
shift | shift | |||
done | done | |||
docker_run_opts+=( | docker_run_opts+=( | |||
--env "KUBE_FASTBUILD=${KUBE_FASTBUILD:-false}" | --env "KUBE_FASTBUILD=${KUBE_FASTBUILD:-false}" | |||
--env "KUBE_BUILDER_OS=${OSTYPE:-notdetected}" | --env "KUBE_BUILDER_OS=${OSTYPE:-notdetected}" | |||
--env "KUBE_VERBOSE=${KUBE_VERBOSE}" | --env "KUBE_VERBOSE=${KUBE_VERBOSE}" | |||
--env "KUBE_BUILD_WITH_COVERAGE=${KUBE_BUILD_WITH_COVERAGE:-}" | --env "KUBE_BUILD_WITH_COVERAGE=${KUBE_BUILD_WITH_COVERAGE:-}" | |||
--env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}" | --env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}" | |||
--env "GOFLAGS=${GOFLAGS:-}" | --env "GOFLAGS=${GOFLAGS:-}" | |||
--env "GOLDFLAGS=${GOLDFLAGS:-}" | ||||
--env "GOGCFLAGS=${GOGCFLAGS:-}" | --env "GOGCFLAGS=${GOGCFLAGS:-}" | |||
--env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}" | --env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}" | |||
) | ) | |||
# use GOLDFLAGS only if it is set explicitly. | ||||
if [[ -v GOLDFLAGS ]]; then | ||||
docker_run_opts+=( | ||||
--env "GOLDFLAGS=${GOLDFLAGS:-}" | ||||
) | ||||
fi | ||||
if [[ -n "${DOCKER_CGROUP_PARENT:-}" ]]; then | if [[ -n "${DOCKER_CGROUP_PARENT:-}" ]]; then | |||
kube::log::status "Using ${DOCKER_CGROUP_PARENT} as container cgroup parent" | kube::log::status "Using ${DOCKER_CGROUP_PARENT} as container cgroup parent" | |||
docker_run_opts+=(--cgroup-parent "${DOCKER_CGROUP_PARENT}") | docker_run_opts+=(--cgroup-parent "${DOCKER_CGROUP_PARENT}") | |||
fi | fi | |||
# If we have stdin we can run interactive. This allows things like 'shell.sh' | # If we have stdin we can run interactive. This allows things like 'shell.sh' | |||
# to work. However, if we run this way and don't have stdin, then it ends up | # to work. However, if we run this way and don't have stdin, then it ends up | |||
# running in a daemon-ish mode. So if we don't have a stdin, we explicitly | # running in a daemon-ish mode. So if we don't have a stdin, we explicitly | |||
# attach stderr/stdout but don't bother asking for a tty. | # attach stderr/stdout but don't bother asking for a tty. | |||
if [[ -t 0 ]]; then | if [[ -t 0 ]]; then | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 7 lines changed or added |