include /etc/{passwd,group,nsswitch.conf} into resources (NixOS#6)

tenx-tech · May 22, 2019 · d2d7f4a · d2d7f4a
1 parent 6656603
commit d2d7f4a
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 9 deletions.
diff --git a/...tools/continuous-integration/concourse/assets/resources/docker-image-resource/default.nix b/...tools/continuous-integration/concourse/assets/resources/docker-image-resource/default.nix
@@ -80,6 +80,19 @@ let
         "GIT_SSL_CAINFO=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
         "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
       ];
+      extraCommands = ''
+        chmod +w etc
+
+        cat >etc/passwd <<EOF
+        root:x:0:0::/root:/bin/sh
+        EOF
+        cat >etc/group <<EOF
+        root:x:0:
+        EOF
+        cat >etc/nsswitch.conf <<EOF
+        hosts: files dns
+        EOF
+      '';
     };
 
   dir =

diff --git a/...elopment/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix b/...elopment/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix
@@ -21,7 +21,7 @@ let
     paths = with pkgs; [
       bashInteractive
       cacert
-      coreutils
+      busybox
       docker
       gawk
       git
@@ -39,14 +39,6 @@ let
     postBuild = ''
       mkdir -p $out/root $out/opt/resource
       cp -a ${src}/assets/. $out/opt/resource/
-
-      cat >$out/etc/gitconfig <<EOF
-      [user]
-        email = git@localhost
-        name = git
-      [http]
-        sslcainfo = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
-      EOF
     '';
   };
 
@@ -60,6 +52,26 @@ let
         "GIT_SSL_CAINFO=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
         "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
       ];
+      extraCommands = ''
+        chmod +w etc
+
+        cat >etc/gitconfig <<EOF
+        [user]
+          email = git@localhost
+          name = git
+        [http]
+          sslcainfo = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
+        EOF
+        cat >etc/passwd <<EOF
+        root:x:0:0::/root:/bin/sh
+        EOF
+        cat >etc/group <<EOF
+        root:x:0:
+        EOF
+        cat >etc/nsswitch.conf <<EOF
+        hosts: files dns
+        EOF
+      '';
     };
 
   dir =

diff --git a/...ols/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix b/...ols/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix
@@ -41,6 +41,19 @@ let
         "GIT_SSL_CAINFO=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
         "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
       ];
+      extraCommands = ''
+        chmod +w etc
+
+        cat >etc/passwd <<EOF
+        root:x:0:0::/root:/bin/sh
+        EOF
+        cat >etc/group <<EOF
+        root:x:0:
+        EOF
+        cat >etc/nsswitch.conf <<EOF
+        hosts: files dns
+        EOF
+      '';
     };
 
   dir =