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

Merge pull request #38520 from ixdy/clean-no-docker

Browse Source 
Automatic merge from submit-queue

Don't require docker or other tools when running `make clean`

**What this PR does / why we need it**: we don't require `docker` for a local build, so we shouldn't require it for `make clean` either.

**Which issue this PR fixes**: fixes #37690

cc @sebgoa
This commit is contained in:
Kubernetes Submit Queue 2016-12-10 15:48:30 -08:00 committed by GitHub
commit 8ccecf93aa
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-tools/common.sh
View File

@ -137,6 +137,8 @@ kube::build::get_docker_wrapped_binaries() {
# Verify that the right utilities and such are installed for building Kube. Set # Verify that the right utilities and such are installed for building Kube. Set
# up some dynamic constants. # up some dynamic constants.
# Args:
# $1 - boolean of whether to require functioning docker (default true)
# #
# Vars set: # Vars set:
# KUBE_ROOT_HASH # KUBE_ROOT_HASH
@ -152,18 +154,21 @@ kube::build::get_docker_wrapped_binaries() {
# DOCKER_MOUNT_ARGS # DOCKER_MOUNT_ARGS
# LOCAL_OUTPUT_BUILD_CONTEXT # LOCAL_OUTPUT_BUILD_CONTEXT
function kube::build::verify_prereqs() { function kube::build::verify_prereqs() {
local -r require_docker=${1:-true}
kube::log::status "Verifying Prerequisites...." kube::log::status "Verifying Prerequisites...."
kube::build::ensure_tar || return 1 kube::build::ensure_tar || return 1
kube::build::ensure_rsync || return 1 kube::build::ensure_rsync || return 1
kube::build::ensure_docker_in_path || return 1 if ${require_docker}; then
if kube::build::is_osx; then kube::build::ensure_docker_in_path || return 1
kube::build::docker_available_on_osx || return 1 if kube::build::is_osx; then
fi kube::build::docker_available_on_osx || return 1
kube::build::ensure_docker_daemon_connectivity || return 1 fi
kube::build::ensure_docker_daemon_connectivity || return 1
if (( ${KUBE_VERBOSE} > 6 )); then if (( ${KUBE_VERBOSE} > 6 )); then
kube::log::status "Docker Version:" kube::log::status "Docker Version:"
"${DOCKER[@]}" version | kube::log::info_from_stdin "${DOCKER[@]}" version | kube::log::info_from_stdin
fi
fi fi
KUBE_ROOT_HASH=$(kube::build::short_hash "${HOSTNAME:-}:${KUBE_ROOT}") KUBE_ROOT_HASH=$(kube::build::short_hash "${HOSTNAME:-}:${KUBE_ROOT}")

2
build-tools/make-clean.sh
View File

@ -22,5 +22,5 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/build-tools/common.sh" source "${KUBE_ROOT}/build-tools/common.sh"
kube::build::verify_prereqs kube::build::verify_prereqs false
kube::build::clean kube::build::clean