Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
47217f4c
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,发现更多精彩内容 >>
未验证
提交
47217f4c
编写于
12月 08, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
12月 08, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9635 from afbjorklund/podman2-iso
ISO: Upgrade podman to version 2.2.0 and remove varlink
上级
3e670f24
01ff1deb
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
47 addition
and
24 deletion
+47
-24
deploy/iso/minikube-iso/board/coreos/minikube/users
deploy/iso/minikube-iso/board/coreos/minikube/users
+1
-1
deploy/iso/minikube-iso/package/Config.in
deploy/iso/minikube-iso/package/Config.in
+0
-1
deploy/iso/minikube-iso/package/podman/override.conf
deploy/iso/minikube-iso/package/podman/override.conf
+4
-0
deploy/iso/minikube-iso/package/podman/podman.conf
deploy/iso/minikube-iso/package/podman/podman.conf
+1
-0
deploy/iso/minikube-iso/package/podman/podman.hash
deploy/iso/minikube-iso/package/podman/podman.hash
+2
-0
deploy/iso/minikube-iso/package/podman/podman.mk
deploy/iso/minikube-iso/package/podman/podman.mk
+39
-6
deploy/iso/minikube-iso/package/varlink/Config.in
deploy/iso/minikube-iso/package/varlink/Config.in
+0
-3
deploy/iso/minikube-iso/package/varlink/varlink.hash
deploy/iso/minikube-iso/package/varlink/varlink.hash
+0
-4
deploy/iso/minikube-iso/package/varlink/varlink.mk
deploy/iso/minikube-iso/package/varlink/varlink.mk
+0
-9
未找到文件。
deploy/iso/minikube-iso/board/coreos/minikube/users
浏览文件 @
47217f4c
docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf -
docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf
,podman
-
deploy/iso/minikube-iso/package/Config.in
浏览文件 @
47217f4c
menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/varlink/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin/Config.in"
...
...
deploy/iso/minikube-iso/package/podman/override.conf
0 → 100644
浏览文件 @
47217f4c
[
Socket
]
SocketMode
=
0660
SocketUser
=
root
SocketGroup
=
podman
deploy/iso/minikube-iso/package/podman/podman.conf
0 → 100644
浏览文件 @
47217f4c
d
/
run
/
podman
0770
root
podman
deploy/iso/minikube-iso/package/podman/podman.hash
浏览文件 @
47217f4c
sha256 a16846fe076aaf2c9ea2e854c3baba9fb838d916be7fb4b5be332e6c92d907d4 v1.9.3.tar.gz
sha256 5ebaa6e0dbd7fd1863f70d2bc71dc8a94e195c3339c17e3cac4560c9ec5747f8 v2.1.1.tar.gz
sha256 ec5473e51fa28f29af323473fc484f742dc7df23d06d8ba9f217f13382893a71 v2.2.0.tar.gz
deploy/iso/minikube-iso/package/podman/podman.mk
浏览文件 @
47217f4c
PODMAN_DUMMY
=
DUMMY
PODMAN_VERSION
=
v1.9.3
PODMAN_COMMIT
=
5d44534fff6877b1cb15b760242279ae6293154c
PODMAN_VERSION
=
v2.2.0
PODMAN_COMMIT
=
db1d2ff111ee9b012779ff3a5279a982520ccda4
PODMAN_SITE
=
https://github.com/containers/podman/archive
PODMAN_SOURCE
=
$(PODMAN_VERSION)
.tar.gz
PODMAN_LICENSE
=
Apache-2.0
PODMAN_LICENSE_FILES
=
LICENSE
PODMAN_DEPENDENCIES
=
host-go
ifeq
($(BR2_INIT_SYSTEMD),y)
# need libsystemd for journal
PODMAN_DEPENDENCIES
+=
systemd
endif
PODMAN_GOPATH
=
$
(
@D
)
/_output
PODMAN_BIN_ENV
=
\
...
...
@@ -17,11 +20,24 @@ PODMAN_BIN_ENV = \
PATH
=
$(PODMAN_GOPATH)
/bin:
$(BR_PATH)
define
PODMAN_USERS
-
-1
podman
-1
-
-
-
-
-
endef
define
PODMAN_MOD_VENDOR_MAKEFILE
# "build flag -mod=vendor only valid when using modules"
sed
-e
's|-mod=vendor ||'
-i
$(@D)/Makefile
endef
PODMAN_POST_EXTRACT_HOOKS
+=
PODMAN_MOD_VENDOR_MAKEFILE
define
PODMAN_CONFIGURE_CMDS
mkdir
-p
$(PODMAN_GOPATH)
&&
mv
$(@D)/vendor
$(PODMAN_GOPATH)/src
mkdir
-p
$(PODMAN_GOPATH)/src/github.com/containers
ln
-sf
$(@D)
$(PODMAN_GOPATH)/src/github.com/containers/
libpod
mkdir
-p
$(PODMAN_GOPATH)/src/github.com/varlink
ln
-sf
$(@D)
/vendor/github.com/varlink/go
$(PODMAN_GOPATH)/src/github.com/varlink/go
ln
-sf
$(@D)
$(PODMAN_GOPATH)/src/github.com/containers/
podman
ln
-sf
$(@D)
$(PODMAN_GOPATH)/src/github.com/containers/podman/v2
endef
define
PODMAN_BUILD_CMDS
...
...
@@ -35,4 +51,21 @@ define PODMAN_INSTALL_TARGET_CMDS
$(INSTALL)
-m
644
$(@D)/cni/87-podman-bridge.conflist
$(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist
endef
define
PODMAN_INSTALL_INIT_SYSTEMD
$(INSTALL)
-D
-m
644
\
$(@D)/contrib/systemd/system/podman.service
\
$(TARGET_DIR)/usr/lib/systemd/system/podman.service
$(INSTALL)
-D
-m
644
\
$(@D)/contrib/systemd/system/podman.socket
\
$(TARGET_DIR)/usr/lib/systemd/system/podman.socket
# Allow running podman-remote as a user in the group "podman"
$(INSTALL)
-D
-m
644
\
$(PODMAN_PKGDIR)/override.conf
\
$(TARGET_DIR)/usr/lib/systemd/system/podman.socket.d/override.conf
$(INSTALL)
-D
-m
644
\
$(PODMAN_PKGDIR)/podman.conf
\
$(TARGET_DIR)/usr/lib/tmpfiles.d/podman.conf
endef
$(eval
$(generic-package))
deploy/iso/minikube-iso/package/varlink/Config.in
已删除
100644 → 0
浏览文件 @
3e670f24
config BR2_PACKAGE_VARLINK
bool "varlink"
default y
deploy/iso/minikube-iso/package/varlink/varlink.hash
已删除
100644 → 0
浏览文件 @
3e670f24
sha256 3857f109574750403b233b5fdf73f1852d8decc33dac8f73bd49f2003b69ad22 16.tar.gz
sha256 0dcb451f32033154c56710c216e67f245923fe2b011321271f6670e5a2285ce6 17.tar.gz
sha256 7a32543643116ad105da4ddb2f8030de7dcad1cdb3feb1a214ae5e7b65a6a198 18.tar.gz
sha256 0e316138ef6abc34363b05d0caf6df2e389a93b832e8d971e3ae64b48ba96133 19.tar.gz
deploy/iso/minikube-iso/package/varlink/varlink.mk
已删除
100644 → 0
浏览文件 @
3e670f24
VARLINK_VERSION
=
19
VARLINK_SITE
=
https://github.com/varlink/libvarlink/archive
VARLINK_SOURCE
=
$(VARLINK_VERSION)
.tar.gz
VARLINK_LICENSE
=
Apache-2.0
VARLINK_LICENSE_FILES
=
LICENSE
VARLINK_NEEDS_HOST_PYTHON
=
python3
$(eval
$(meson-package))
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录