forked from github-mirror/docker-nixpkgs
Compare commits
4 Commits
master
...
nix-unstab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5c8f11da0 | ||
|
|
019b4effa9 | ||
|
|
e380dbbda5 | ||
|
|
23c51fe60b |
@@ -6,21 +6,20 @@
|
||||
, python3
|
||||
, removeReferencesTo
|
||||
, runCommand
|
||||
, buildPackages
|
||||
}:
|
||||
let
|
||||
inherit (pkgsStatic)
|
||||
bashInteractive
|
||||
busybox
|
||||
cacert
|
||||
openssl
|
||||
;
|
||||
cacert;
|
||||
|
||||
bash = bashInteractive;
|
||||
|
||||
# Get nix from Hydra because the nixpkgs one is not fully static
|
||||
nixStaticBin = fetchurl {
|
||||
url = "https://hydra.nixos.org/build/181573550/download/1/nix";
|
||||
hash = "sha256-zO2xJhQIrLtL/ReTlcorjwsaTO1W5Rnr+sXwcLcujok=";
|
||||
url = "https://hydra.nixos.org/build/228458395/download/1/nix";
|
||||
hash = "sha256-H361lUdMpBpBVwInBmpAXKAwjPIf740Jg9Nht0NV66s=";
|
||||
};
|
||||
|
||||
nixSymlinks = [
|
||||
@@ -64,6 +63,11 @@ let
|
||||
# Add user home folder
|
||||
mkdir home
|
||||
|
||||
# Create an unpriveleged user that we can use also without the run-as-user.sh script
|
||||
chmod +w $PWD/etc/group $PWD/etc/passwd
|
||||
${buildPackages.shadow}/bin/groupadd --prefix $PWD -g 9000 nixuser
|
||||
${buildPackages.shadow}/bin/useradd --prefix $PWD -m -d /tmp -u 9000 -g 9000 -G nixuser nixuser
|
||||
|
||||
# Add SSL CA certs
|
||||
cp -a "${cacert}/etc/ssl/certs/ca-bundle.crt" etc/ssl/certs/ca-bundle.crt
|
||||
|
||||
@@ -117,7 +121,8 @@ let
|
||||
Env = [
|
||||
"NIX_BUILD_SHELL=/bin/bash"
|
||||
"PAGER=cat"
|
||||
"PATH=/bin"
|
||||
# /host/bin can be used to extend the image with additional binaries
|
||||
"PATH=/bin:/host/bin"
|
||||
"SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt"
|
||||
];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user