Merge pull request #1595 from peti/master
docker: ensure that the installation works for users other than 'root'
This commit is contained in:
commit
3d3c7fadf7
1 changed files with 8 additions and 8 deletions
|
@ -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 \
|
&& 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 \
|
&& 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 \
|
&& 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 /nix-*-x86_64-linux \
|
||||||
&& rm -r /var/cache/apk/*
|
&& rm -r /var/cache/apk/*
|
||||||
|
|
||||||
ONBUILD ENV \
|
ONBUILD ENV \
|
||||||
ENV=/etc/profile \
|
ENV=/etc/profile \
|
||||||
PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
|
PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
|
||||||
GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \
|
GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt \
|
||||||
NIX_SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
|
||||||
|
|
||||||
ENV \
|
ENV \
|
||||||
ENV=/etc/profile \
|
ENV=/etc/profile \
|
||||||
PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
|
PATH=/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin \
|
||||||
GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \
|
GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt \
|
||||||
NIX_SSL_CERT_FILE=/root/.nix-profile/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/
|
NIX_PATH=/nix/var/nix/profiles/per-user/root/channels
|
||||||
|
|
Loading…
Reference in a new issue