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
f18cd536
Commit
f18cd536
authored
Nov 16, 2014
by
Joe Beda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make dockerized build work when golang isn't installed.
parent
ccc8bc82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
1 deletion
+44
-1
init.sh
hack/lib/init.sh
+1
-1
util.sh
hack/lib/util.sh
+43
-0
No files found.
hack/lib/init.sh
View file @
f18cd536
...
@@ -39,4 +39,4 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
...
@@ -39,4 +39,4 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/golang.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/golang.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/etcd.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/etcd.sh"
KUBE_OUTPUT_HOSTBIN
=
"
${
KUBE_OUTPUT_BINPATH
}
/
$(
kube::
golang
::host_platform
)
"
KUBE_OUTPUT_HOSTBIN
=
"
${
KUBE_OUTPUT_BINPATH
}
/
$(
kube::
util
::host_platform
)
"
hack/lib/util.sh
View file @
f18cd536
...
@@ -36,3 +36,46 @@ kube::util::wait_for_url() {
...
@@ -36,3 +36,46 @@ kube::util::wait_for_url() {
kube::log::error
"Timed out waiting for
${
url
}
"
kube::log::error
"Timed out waiting for
${
url
}
"
return
1
return
1
}
}
# This figures out the host platform without relying on golang. We need this as
# we don't want a golang install to be a prerequisite to building yet we need
# this info to figure out where the final binaries are placed.
kube::util::host_platform
()
{
local
host_os
local
host_arch
case
"
$(
uname
-s
)
"
in
Darwin
)
host_os
=
darwin
;;
Linux
)
host_os
=
linux
;;
*
)
kube::log::error
"Unsupported host OS. Must be Linux or Mac OS X."
exit
1
;;
esac
case
"
$(
uname
-m
)
"
in
x86_64
*
)
host_arch
=
amd64
;;
i?86_64
*
)
host_arch
=
amd64
;;
amd64
*
)
host_arch
=
amd64
;;
arm
*
)
host_arch
=
arm
;;
i?86
*
)
host_arch
=
x86
;;
*
)
kube::log::error
"Unsupported host arch. Must be x86_64, 386 or arm."
exit
1
;;
esac
echo
"
${
host_os
}
/
${
host_arch
}
"
}
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