Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1cb361ea
Commit
1cb361ea
authored
Aug 14, 2016
by
Cole Mickens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle spaces in some hack/ scripts. Cleanup after hyperkube build.
parent
89651077
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
Makefile
cluster/images/hyperkube/Makefile
+1
-0
dev-push-hyperkube.sh
hack/dev-push-hyperkube.sh
+1
-1
init.sh
hack/lib/init.sh
+1
-1
No files found.
cluster/images/hyperkube/Makefile
View file @
1cb361ea
...
@@ -110,6 +110,7 @@ else
...
@@ -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
}
...
...
hack/dev-push-hyperkube.sh
View file @
1cb361ea
...
@@ -27,7 +27,7 @@ set -o errexit
...
@@ -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
...
...
hack/lib/init.sh
View file @
1cb361ea
...
@@ -19,7 +19,7 @@ set -o nounset
...
@@ -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
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment