Skip to content

K
k3s
Commit c39b584e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30583 from colemickens/fix-hack-path-handling

Automatic merge from submit-queue fix path handling in hack/lib/init.sh Jenkinsfile pipeline jobs get cloned into "\<project\> (\<branch\>)". As a result, I can't use certain things in `hack/lib/init.sh`. This is a small fix for that problem. **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ```release-note NONE ```
parents 7979801e 1cb361ea
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
cluster/images/hyperkube/Makefile
View file @ c39b584e
......@@ -110,6 +110,7 @@ else
endif
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
push: build
gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
......
hack/dev-push-hyperkube.sh
View file @ c39b584e
......@@ -27,7 +27,7 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
source "${KUBE_ROOT}/build/common.sh"
if [[ -z "${KUBE_DOCKER_REGISTRY:-}" ]]; then
......
hack/lib/init.sh
View file @ c39b584e
......@@ -19,7 +19,7 @@ set -o nounset
set -o pipefail
# 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="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment