mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #28498 from endocode/kayrus/fix_kuberoot
Automatic merge from submit-queue build: fixed ${KUBE_ROOT} prefix for build scripts Running `./make-build-image.sh` command inside the `build` directory doesn't work: ```sh $ cd build $ ./make-build-image.sh ./../build/common.sh: line 32: hack/lib/init.sh: No such file or directory ``` This PR adds `${KUBE_ROOT}` prefix for the `source` bash function. Also I added braces to unify the code style. []()
This commit is contained in:
commit
e232ecd201
@ -29,7 +29,7 @@ readonly DOCKER_MACHINE_DRIVER=${DOCKER_MACHINE_DRIVER:-"virtualbox --virtualbox
|
|||||||
# This will canonicalize the path
|
# This will canonicalize the path
|
||||||
KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
|
KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
|
||||||
|
|
||||||
source hack/lib/init.sh
|
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||||
|
|
||||||
# Incoming options
|
# Incoming options
|
||||||
#
|
#
|
||||||
|
@ -23,7 +23,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
kube::build::verify_prereqs
|
kube::build::verify_prereqs
|
||||||
kube::build::copy_output
|
kube::build::copy_output
|
||||||
|
@ -25,7 +25,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
|
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
kube::build::verify_prereqs
|
kube::build::verify_prereqs
|
||||||
kube::build::build_image
|
kube::build::build_image
|
||||||
|
@ -20,7 +20,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
kube::build::verify_prereqs
|
kube::build::verify_prereqs
|
||||||
kube::build::clean_output
|
kube::build::clean_output
|
||||||
|
@ -29,6 +29,6 @@ KUBE_GCS_UPLOAD_RELEASE=y
|
|||||||
KUBE_GCS_RELEASE_PREFIX="devel/${LATEST}"
|
KUBE_GCS_RELEASE_PREFIX="devel/${LATEST}"
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
kube::release::gcs::release
|
kube::release::gcs::release
|
||||||
|
@ -24,7 +24,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}
|
KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||||
source "$KUBE_ROOT/build/common.sh"
|
source "${KUBE_ROOT}/build/common.sh"
|
||||||
|
|
||||||
kube::build::verify_prereqs
|
kube::build::verify_prereqs
|
||||||
kube::build::build_image
|
kube::build::build_image
|
||||||
|
Loading…
Reference in New Issue
Block a user