on master help sign in
remove cargo culted shadowSetup

obelisk doesn't need fully working users; this makes the build faster and requires less time to build

commit4bc2397e9a8571556cd638884fd2127e6d7f2d88 authorDan Bornside <dan.bornside@obsidian.systems> dateThu 12 Sep 2019, 13:37 (7 years ago) parent945cfef
1 file changed+6−18
default.nix+6−18
default.nix+6−18
@@ -238,30 +238,18 @@ in rec {
238238 };
239239
240240 dockerImage = args@{exe, name, version}: let
241− dockerImageSetupScript = nixpkgs.dockerTools.shellScript "dockersetup.sh" ''
242− set -ex
243−
244− ${nixpkgs.dockerTools.shadowSetup}
245− echo 'nobody:x:99:99:Nobody:/:/sbin/nologin' >> /etc/passwd
246− echo 'nobody:*:17416:0:99999:7:::' >> /etc/shadow
247− echo 'nobody:x:99:' >> /etc/group
248− echo 'nobody:::' >> /etc/gshadow
249−
250− mkdir -p /var/run/backend
251− ln -sft /var/run/backend '${exe}'/*
252− ${nixpkgs.findutils}/bin/find /var/run/backend
253−
254− chown 99:99 /var/run/backend
255− '';
241+ appDirSetupScript = nixpkgs.runCommand "appDirSetupScript.sh" {} ''
242+ mkdir -p $out/var/run/backend
243+ ln -sft $out/var/run/backend '${exe}'/*
244+ ${nixpkgs.findutils}/bin/find $out/var/run/backend
245+ '';
256246
257247 in nixpkgs.dockerTools.buildImage {
258248 name = name;
259249 tag = version;
260− contents = [ nixpkgs.iana-etc nixpkgs.cacert ];
261− runAsRoot = dockerImageSetupScript;
250+ contents = [ nixpkgs.iana-etc nixpkgs.cacert appDirSetupScript ];
262251 keepContentsDirlinks = true;
263252 config = {
264−
265253 Env = [
266254 ("PATH=" + builtins.concatStringsSep(":")([
267255 "/var/run/backend"