Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
f2c385fc
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f2c385fc
编写于
1月 09, 2020
作者:
A
Anders F Björklund
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow building storage-provisioner for other arch
Also allow building the static binary in docker
上级
cdafd166
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
30 deletion
+19
-30
Makefile
Makefile
+17
-12
deploy/storage-provisioner/Dockerfile
deploy/storage-provisioner/Dockerfile
+2
-1
deploy/storage-provisioner/Dockerfile-s390x
deploy/storage-provisioner/Dockerfile-s390x
+0
-17
未找到文件。
Makefile
浏览文件 @
f2c385fc
...
...
@@ -81,6 +81,12 @@ BUILD_OS := $(shell uname -s)
SHA512SUM
=
$(
shell
command
-v
sha512sum
||
echo
"shasum -a 512"
)
STORAGE_PROVISIONER_TAG
:=
v1.8.1
# TODO: multi-arch manifest
ifeq
($(GOARCH),amd64)
STORAGE_PROVISIONER_IMAGE
?=
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
else
STORAGE_PROVISIONER_IMAGE
?=
$(REGISTRY)
/storage-provisioner-
$(GOARCH)
:
$(STORAGE_PROVISIONER_TAG)
endif
# Set the version information for the Kubernetes servers
MINIKUBE_LDFLAGS
:=
-X
k8s.io/minikube/pkg/version.version
=
$(VERSION)
-X
k8s.io/minikube/pkg/version.isoVersion
=
$(ISO_VERSION)
-X
k8s.io/minikube/pkg/version.isoPath
=
$(ISO_BUCKET)
-X
k8s.io/minikube/pkg/version.gitCommitID
=
$(COMMIT)
...
...
@@ -472,17 +478,20 @@ $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile
@
echo
""
@
echo
"
$
(@) successfully built"
out/storage-provisioner
:
CGO_ENABLED
=
0
GOOS
=
linux go build
-o
$@
-ldflags
=
$(PROVISIONER_LDFLAGS)
cmd/storage-provisioner/main.go
out/storage-provisioner
:
out/storage-provisioner-$(GOARCH)
cp
$<
$@
.PHONY
:
storage-provisioner-image
storage-provisioner-image
:
out/storage-provisioner
##
Build storage-provisioner docker image
ifeq
($(GOARCH),amd64)
docker build
-t
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
-f
deploy/storage-provisioner/Dockerfile .
out/storage-provisioner-%
:
cmd/storage-provisioner/main.go pkg/storage/storage_provisioner.go
ifeq
($(MINIKUBE_BUILD_IN_DOCKER),y)
$(
call
DOCKER,
$(BUILD_IMAGE)
,/usr/bin/make
$@
)
else
docker build
-t
$(REGISTRY)
/storage-provisioner-
$(GOARCH)
:
$(STORAGE_PROVISIONER_TAG)
-f
deploy/storage-provisioner/Dockerfile-
$(GOARCH)
.
CGO_ENABLED
=
0
GOOS
=
linux
GOARCH
=
$*
go build
-o
$@
-ldflags
=
$(PROVISIONER_LDFLAGS)
cmd/storage-provisioner/main.go
endif
.PHONY
:
storage-provisioner-image
storage-provisioner-image
:
out/storage-provisioner-$(GOARCH)
##
Build storage-provisioner docker image
docker build
-t
$(STORAGE_PROVISIONER_IMAGE)
-f
deploy/storage-provisioner/Dockerfile
--build-arg
arch
=
$(GOARCH)
.
.PHONY
:
kic-base-image
kic-base-image
:
##
builds the base image used for kic.
docker rmi
-f
$(REGISTRY)
/kicbase:v0.0.1-snapshot
||
true
...
...
@@ -492,11 +501,7 @@ kic-base-image: ## builds the base image used for kic.
.PHONY
:
push-storage-provisioner-image
push-storage-provisioner-image
:
storage-provisioner-image
##
Push storage-provisioner docker image using gcloud
ifeq
($(GOARCH),amd64)
gcloud docker
--
push
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
else
gcloud docker
--
push
$(REGISTRY)
/storage-provisioner-
$(GOARCH)
:
$(STORAGE_PROVISIONER_TAG)
endif
gcloud docker
--
push
$(STORAGE_PROVISIONER_IMAGE)
.PHONY
:
out/gvisor-addon
out/gvisor-addon
:
pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
##
Build gvisor addon
...
...
deploy/storage-provisioner/Dockerfile
浏览文件 @
f2c385fc
...
...
@@ -13,5 +13,6 @@
# limitations under the License.
FROM
scratch
COPY
out/storage-provisioner storage-provisioner
ARG
arch
COPY
out/storage-provisioner-${arch} storage-provisioner
CMD
["/storage-provisioner"]
deploy/storage-provisioner/Dockerfile-s390x
已删除
100644 → 0
浏览文件 @
cdafd166
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM s390x/ubuntu:16.04
COPY out/storage-provisioner storage-provisioner
CMD ["/storage-provisioner"]
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录