From fb0a6f454865072e74d0984468691f3f327f2d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 22 May 2019 20:15:21 +0200 Subject: [PATCH] Make buildah --no-pivot default, using env var Needed for doing "podman build" (uses buildah) when running on rootfs. This environment variable has the same affect as DOCKER_RAMDISK does. --- deploy/iso/minikube-iso/package/podman/buildah.profile | 3 +++ deploy/iso/minikube-iso/package/podman/podman.mk | 1 + 2 files changed, 4 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/podman/buildah.profile diff --git a/deploy/iso/minikube-iso/package/podman/buildah.profile b/deploy/iso/minikube-iso/package/podman/buildah.profile new file mode 100644 index 0000000000..8ca368b053 --- /dev/null +++ b/deploy/iso/minikube-iso/package/podman/buildah.profile @@ -0,0 +1,3 @@ +# BUILDAH_NOPIVOT=true disables pivot_root in Buildah, using MS_MOVE instead. +# (Buildah is used by Podman for building container images using a Dockerfile) +export BUILDAH_NOPIVOT=true diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 77f7c780c8..b5ad703b7a 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -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/buildah.profile $(TARGET_DIR)/etc/profile.d/podman.sh endef $(eval $(generic-package))