Merge pull request #4321 from afbjorklund/podman-buildah

Make buildah --no-pivot default, using env var
kubernetes · May 29, 2019 · 516904c · 516904c
2 parents 2875909 + fb0a6f4
commit 516904c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/deploy/iso/minikube-iso/package/podman/buildah.profile 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
@@ -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))