From 5cf123335c9537cae2a39b07a5256ff31ba649fc Mon Sep 17 00:00:00 2001
From: Julien 'Lta' BALLET <contact@lta.io>
Date: Thu, 3 Jun 2021 22:50:34 +0200
Subject: [PATCH] oci: configurable tmpdir

---
 oci/oci.build_defs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/oci/oci.build_defs b/oci/oci.build_defs
index 1154c28..8da37e4 100644
--- a/oci/oci.build_defs
+++ b/oci/oci.build_defs
@@ -44,6 +44,10 @@ def container_image(
         dockerfile = containerfile
     transitive_base_images = [canonicalise(rule) for rule in transitive_base_images]
     base_image_target = base_image
+    
+    # OCI_TMPDIR: If your code and /tmp are in different file systems, the hard-link used by
+    # this rule will not work. In that case, you can use the OCI_TMPDIR buildconfig
+    oci_tmpdir=CONFIG.get('OCI_TMPDIR', '/tmp')
 
     def assert_transitive_base_images_present():
         """
@@ -81,7 +85,7 @@ def container_image(
         if srcs:
             context = "$STORE/context"
             srcs_dict['context'] = srcs
-            cmds += [f'mkdir "{context}"', f'mv $SRCS_CONTEXT "{context}"']
+            cmds += [f'mkdir "{context}"', f'mv "$SRCS_CONTEXT" "{context}"']
         return context, cmds
 
     def build_using_dockerfile(srcs_dict:dict, cmds:list, base_image:str, context:str):
@@ -120,7 +124,7 @@ def container_image(
         # Buildah uses an image store, which can be ephemeral, except that please fails to delete it
         # due to permissions. This uses a cache in /tmp, outside the build rule dir, where it
         # doesnt have to be deleted by please. It is deleted on successful build or system restart.
-        'STORE=$(TMPDIR=/tmp mktemp -d)',
+        f'STORE=$(TMPDIR="{oci_tmpdir}" mktemp -d)',
         'TOOL="$TOOL --root=$STORE/containers --runroot=$STORE/run"',
     ]
     base_image, cmds, labels, pre_build = format_base_image(srcs_dict, cmds, labels)
@@ -186,7 +190,7 @@ def container_image(
     if srcs_dict.get('base'):
         base_images = transitive_base_images + srcs_dict['base']
         data += base_images
-        cmds += ['tmp_dir=\\\$(mktemp -d)', f'cp -rl $(out_location {image_rule})/* \\\$tmp_dir']
+        cmds += [f'tmp_dir=\\\$(TMPDIR="{oci_tmpdir}" mktemp -d)', f'cp -rl $(out_location {image_rule})/* \\\$tmp_dir']
         for base in base_images:
             cmds += [f'cp -l $(out_location {base})/blobs/sha256/* "\\\$tmp_dir/blobs/sha256"']
         img_loc = f'oci:\\\$tmp_dir'