mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Handle spaces in some hack/ scripts. Cleanup after hyperkube build.
This commit is contained in:
parent
89651077b1
commit
1cb361ea2b
@ -110,6 +110,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
||||||
|
rm -rf "${TEMP_DIR}"
|
||||||
|
|
||||||
push: build
|
push: build
|
||||||
gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
|
gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
|
||||||
|
@ -27,7 +27,7 @@ set -o errexit
|
|||||||
set -o nounset
|
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"
|
||||||
|
|
||||||
if [[ -z "${KUBE_DOCKER_REGISTRY:-}" ]]; then
|
if [[ -z "${KUBE_DOCKER_REGISTRY:-}" ]]; then
|
||||||
|
@ -19,7 +19,7 @@ set -o nounset
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
# The root of the build/dist directory
|
# The root of the build/dist directory
|
||||||
KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/../.. && pwd -P)
|
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)"
|
||||||
|
|
||||||
KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}"
|
KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}"
|
||||||
KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}"
|
KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}"
|
||||||
|
Loading…
Reference in New Issue
Block a user