kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4421 from afbjorklund/podman-run 

Enable running containers with Podman
pull/4572/head
Thomas Strömberg 2019-06-24 09:49:05 +08:00 committed by GitHub
parent 9d58040dd0 b31c66c807
commit e1f8446886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy/iso/minikube-iso/package/Config.in
View File

@ -1,6 +1,7 @@
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/conmon-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"

7
deploy/iso/minikube-iso/package/conmon-master/Config.in Normal file
View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_CONMON_MASTER
bool "conmon-master"
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_SYSTEMD

1
deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash Normal file
View File

@ -0,0 +1 @@
sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz

24
deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk Normal file
View File

@ -0,0 +1,24 @@
CONMON_MASTER_VERSION = dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152
CONMON_MASTER_SITE = https://github.com/containers/conmon/archive
CONMON_MASTER_SOURCE = $(CONMON_MASTER_VERSION).tar.gz
CONMON_MASTER_LICENSE = Apache-2.0
CONMON_MASTER_LICENSE_FILES = LICENSE
CONMON_MASTER_DEPENDENCIES = host-pkgconf
define CONMON_MASTER_PATCH_PKGCONFIG
sed -e 's/pkg-config/$$(PKG_CONFIG)/g' -i $(@D)/Makefile
endef
CONMON_MASTER_POST_PATCH_HOOKS += CONMON_MASTER_PATCH_PKGCONFIG
define CONMON_MASTER_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CONMON_MASTER_VERSION) PREFIX=/usr
endef
define CONMON_MASTER_INSTALL_TARGET_CMDS
# crio conmon is installed by the crio package, so don't install it here
$(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/podman/conmon
endef
$(eval $(generic-package))

1
deploy/iso/minikube-iso/package/podman/Config.in
View File

@ -5,5 +5,6 @@ config BR2_PACKAGE_PODMAN
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_CONMON_MASTER
select BR2_PACKAGE_LIBSECCOMP
select BR2_PACKAGE_LIBGPGME

2
deploy/iso/minikube-iso/package/podman/libpod.conf Normal file
View File

@ -0,0 +1,2 @@
# Whether to use chroot instead of pivot_root in the runtime
no_pivot_root = true

1
deploy/iso/minikube-iso/package/podman/podman.mk
View File

@ -29,6 +29,7 @@ endef
define PODMAN_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman
$(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/libpod.conf $(TARGET_DIR)/etc/containers/libpod.conf
$(INSTALL) -Dm644 $(BR2_EXTERNAL_MINIKUBE_PATH)/package/podman/buildah.profile $(TARGET_DIR)/etc/profile.d/podman.sh
endef

8
deploy/iso/minikube-iso/package/runc-master/runc-master.mk
View File

@ -23,12 +23,6 @@ RUNC_MASTER_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
RUNC_MASTER_GLDFLAGS = \
-buildmode=pie -X main.gitCommit=$(RUNC_MASTER_VERSION)
ifeq ($(BR2_STATIC_LIBS),y)
RUNC_MASTER_GLDFLAGS += -extldflags '-static'
endif
RUNC_MASTER_GOTAGS = cgo static_build
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
RUNC_MASTER_GOTAGS += seccomp
RUNC_MASTER_DEPENDENCIES += libseccomp host-pkgconf
@ -47,8 +41,6 @@ endef
define RUNC_MASTER_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc
# Install the binary in the location where Docker expects it, so that we can keep runc releases in sync.
ln $(@D)/bin/runc $(TARGET_DIR)/usr/bin/docker-runc
endef
$(eval $(generic-package))