From 745b7ce0b821b1d46b7259c8ba704bf767ad31d6 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 17 Aug 2019 09:29:56 +0000
Subject: fix(build): Ensure root user is known inside of container

This is required by git in cases where Nixery is configured with a
custom git repository.

I've also added a shell back into the image to make debugging a
running Nixery easier. It turns out some of the dependencies already
pull in bash anyways, so this is just surfacing it to $PATH.
---
 tools/nixery/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/nixery/default.nix')

diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index 734a72d57e0b..194cf54608e2 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -61,6 +61,8 @@ rec {
       # Create the build user/group required by Nix
       echo 'nixbld:x:30000:nixbld' >> /etc/group
       echo 'nixbld:x:30000:30000:nixbld:/tmp:/bin/bash' >> /etc/passwd
+      echo 'root:x:0:0:root:/root:/bin/bash' >> /etc/passwd
+      echo 'root:x:0:' >> /etc/group
 
       # Disable sandboxing to avoid running into privilege issues
       mkdir -p /etc/nix
@@ -80,6 +82,7 @@ rec {
     config.Cmd = [ "${nixery-launch-script}/bin/nixery" ];
     maxLayers = 96;
     contents = [
+      bashInteractive
       cacert
       coreutils
       git
@@ -89,6 +92,7 @@ rec {
       nixery-build-image
       nixery-launch-script
       openssh
+      zlib
     ];
   };
 }
-- 
cgit 1.4.1