From a5d11f40417bbf1cfa7fd702d6c45366e9303a77 Mon Sep 17 00:00:00 2001
From: Sander Maijers <3374183+sanmai-NL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:45:21 +0100
Subject: [PATCH] Set `BUILDAH_ISOLATION=chroot` within Podman containers

See: https://developers.redhat.com/blog/2019/08/14/best-practices-for-running-buildah-in-a-container

See: https://github.com/containers/podman/blob/06c41b614db11382579ff2931b9dd145f241b485/docs/source/markdown/options/isolation.md

Signed-off-by: Sander Maijers <3374183+sanmai-NL@users.noreply.github.com>
---
 contrib/podmanimage/upstream/Containerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/podmanimage/upstream/Containerfile b/contrib/podmanimage/upstream/Containerfile
index d5ddef106e..e31b94746f 100644
--- a/contrib/podmanimage/upstream/Containerfile
+++ b/contrib/podmanimage/upstream/Containerfile
@@ -64,4 +64,5 @@ RUN mkdir -p /var/lib/shared/overlay-images \
     touch /var/lib/shared/vfs-images/images.lock && \
     touch /var/lib/shared/vfs-layers/layers.lock
 
-ENV _CONTAINERS_USERNS_CONFIGURED=""
+ENV _CONTAINERS_USERNS_CONFIGURED="" \
+    BUILDAH_ISOLATION=chroot