diff options
| author | Peter Simons <simons@cryp.to> | 2017-10-07T15·28+0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-10-07T15·28+0200 |
| commit | 37164ae389f0118aaec75f2566198e0b5129d9d7 (patch) | |
| tree | e88ff11272627d6cd29a3278b17a383912ce5b1e | |
| parent | b2e00fd5b75e055832ff6dff97fb4fd016ba5d6f (diff) | |
docker: ensure that the installation works for users other than 'root', too
The path /root/.nix-profile is a sym-link to /nix/var/nix/profiles/default. The latter path, however, works for everyone while the former path works only for root, so we prefer the public path whenever possible.
| -rw-r--r-- | misc/docker/Dockerfile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index fb6f73517bb6..d6b88c7e91a5 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -8,19 +8,19 @@ RUN wget -O- https://nixos.org/releases/nix/nix-1.11.14/nix-1.11.14-x86_64-linux && addgroup -g 30000 -S nixbld \ && for i in $(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user $i" -u $((30000 + i)) -G nixbld nixbld$i ; done \ && mkdir -m 0755 /nix && USER=root sh nix-*-x86_64-linux/install \ - && ln -s /root/.nix-profile/etc/profile.d/nix.sh /etc/profile.d/ \ + && ln -s /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/ \ && rm -r /nix-*-x86_64-linux \ && rm -r /var/cache/apk/* ONBUILD ENV \ ENV=/etc/profile \ - PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ - GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ - NIX_SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt + PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ + GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt \ + NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt ENV \ ENV=/etc/profile \ - PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ - GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ - NIX_SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ - NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/ + PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ + GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt \ + NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt \ + NIX_PATH=/nix/var/nix/profiles/per-user/root/channels |