github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1500 from joakimr-axis/joakimr-axis_package-cli 

package-cli: Remove redundant rm -rf build/data
pull/1752/head
Erik Wilson 2020-05-04 19:24:21 -07:00 committed by GitHub
parent 698e444a03 9307fcc332
commit c769bb115a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/package-cli
View File

@ -7,11 +7,11 @@ cd $(dirname $0)/..
GO=${GO-go} GO=${GO-go}
rm -rf bin/crictl bin/kubectl bin/k3s-agent bin/k3s-server bin/kubectl bin/k3s build/data for i in crictl kubectl k3s-agent k3s-server k3s; do
ln -s containerd bin/k3s-agent rm -f bin/$i
ln -s containerd bin/k3s-server ln -s containerd bin/$i
ln -s containerd bin/kubectl done
ln -s containerd bin/crictl
for i in bridge flannel host-local loopback portmap; do for i in bridge flannel host-local loopback portmap; do
rm -f bin/$i rm -f bin/$i
ln -s cni bin/$i ln -s cni bin/$i
@ -56,8 +56,8 @@ LDFLAGS="
-w -s -w -s
" "
STATIC="-extldflags '-static'" STATIC="-extldflags '-static'"
if [ "$DQLITE" = "true" ]; then if [ "$DQLITE" = 'true' ]; then
DQLITE_TAGS="dqlite" DQLITE_TAGS='dqlite'
fi fi
CGO_ENABLED=0 "${GO}" build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go CGO_ENABLED=0 "${GO}" build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go