Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable running containers with Podman #4421

Merged
merged 3 commits into from
Jun 24, 2019
Merged

Enable running containers with Podman #4421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70a00bf
Make podman depend on conmon from master
afbjorklund Jun 3, 2019
32583d8
Install podman configuration to use no_pivot_root
afbjorklund Jun 3, 2019
b31c66c
Link runc dynamically, avoid docker-runc install
afbjorklund Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 7 additions & 0 deletions deploy/iso/minikube-iso/package/conmon-master/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz
24 changes: 24 additions & 0 deletions deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/podman/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/package/podman/libpod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Whether to use chroot instead of pivot_root in the runtime
no_pivot_root = true
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/podman/podman.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions deploy/iso/minikube-iso/package/runc-master/runc-master.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))