about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-09-21T14·15+0100
committerVincent Ambo <github@tazj.in>2019-09-21T14·25+0100
commit21a17b33f49f3f016e35e535af0b81fdb53f0846 (patch)
tree069c7392b033d144b937e48d6f651f2d83e0c48e
parent0000b956bb2333cc09fb52fb063d383ec1fd90e3 (diff)
fix(build): Ensure launch script compatibility with other runtimes
Fixes two launch script compatibility issues with other container
runtimes (such as gvisor):

* don't fail if /tmp already exists
* don't fail if the environment becomes unset
-rw-r--r--tools/nixery/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index dd07d34936e4..66155eefa060 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -59,8 +59,9 @@ rec {
     # issues in containers.
     nixery-launch-script = writeShellScriptBin "nixery" ''
       set -e
+      export PATH=${coreutils}/bin:$PATH
       export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
-      mkdir /tmp
+      mkdir -p /tmp
 
       # Create the build user/group required by Nix
       echo 'nixbld:x:30000:nixbld' >> /etc/group