don't push a folder in; just write bashrc directly

IntersectMBO · May 11, 2021 · 0666d82 · 0666d82
1 parent 1370dc9
commit 0666d82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/nix/devcontainer/root/etc/skel/.bashrc → nix/devcontainer/bashrc b/nix/devcontainer/root/etc/skel/.bashrc → nix/devcontainer/bashrc
diff --git a/nix/devcontainer/devcontainer.nix b/nix/devcontainer/devcontainer.nix
@@ -34,18 +34,13 @@
 , which
 }:
 let
+  bashrc = ./bashrc;
   # I think we should be able to use buildLayeredImage, but for some reason it
   # produces a nonfunctional image
   image = dockerTools.buildImage {
     inherit name tag;
 
     contents = [
-      # See: https://github.com/NixOS/nixpkgs/issues/118722
-      (stdenv.mkDerivation {
-        name = "wrapped";
-        src = ./root;
-        installPhase = "ln -s $src $out";
-      })
       coreutils
       procps
       gnugrep
@@ -98,15 +93,19 @@ let
     runAsRoot = ''
       ${dockerTools.shadowSetup}
       groupadd --gid ${nonRootUserId} ${nonRootUser}
-      useradd --uid ${nonRootUserId} --gid ${nonRootUserId} -m ${nonRootUser}
+      useradd --uid ${nonRootUserId} --gid ${nonRootUserId} ${nonRootUser}
+
+      mkdir -p /home/${nonRootUser}
+      cat ${bashrc} > /home/${nonRootUser}/.bashrc
 
       # Because we map in the `./.cabal` folder from the users home directory,
       # (see: https://github.com/input-output-hk/plutus-starter/blob/main/.devcontainer/devcontainer.json)
       # and because docker won't let us map a volume not as root
       # (see: https://github.com/moby/moby/issues/2259 link), we have to make the
       # folder first and chown it ...
       mkdir /home/${nonRootUser}/.cabal
-      chown ${nonRootUser}:${nonRootUser} /home/${nonRootUser}/.cabal
+
+      chown -R ${nonRootUser}:${nonRootUser} /home/${nonRootUser}
     '';
 
     config = {