diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-09-11T14·44+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11T14·44+0200 |
| commit | 359ede1d729964862d823d54e416d36291a02d79 (patch) | |
| tree | 849fe87c799ebba4dbdabb5be77aad21455b4bfb | |
| parent | fc0ded3408ac1e17924f1901b384bb70125be62f (diff) | |
| parent | 1511f01351c992b2b5b3108e6f1854bac50df71d (diff) | |
Merge pull request #1562 from peti/master
docker: update to Nix 1.11.14
| -rw-r--r-- | misc/docker/Dockerfile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 85bd32e199a9..fb6f73517bb6 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -1,13 +1,16 @@ FROM alpine -RUN wget -O- http://nixos.org/releases/nix/nix-1.11.7/nix-1.11.7-x86_64-linux.tar.bz2 | bzcat - | tar xf - \ - && echo "nixbld:x:30000:nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10,nixbld11,nixbld12,nixbld13,nixbld14,nixbld15,nixbld16,nixbld17,nixbld18,nixbld19,nixbld20,nixbld21,nixbld22,nixbld23,nixbld24,nixbld25,nixbld26,nixbld27,nixbld28,nixbld29,nixbld30" >> /etc/group \ - && for i in $(seq 1 30); do echo "nixbld$i:x:$((30000 + $i)):30000:::" >> /etc/passwd; done \ - && mkdir -m 0755 /nix && USER=root sh nix-*-x86_64-linux/install \ - && echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile \ - && rm -r /nix-*-x86_64-linux \ - && apk --update add bash tar \ - && rm -rf /var/cache/apk/* +# Enable HTTPS support in wget. +RUN apk add --update openssl + +# Download Nix and install it into the system. +RUN wget -O- https://nixos.org/releases/nix/nix-1.11.14/nix-1.11.14-x86_64-linux.tar.bz2 | bzcat - | tar xf - \ + && 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/ \ + && rm -r /nix-*-x86_64-linux \ + && rm -r /var/cache/apk/* ONBUILD ENV \ ENV=/etc/profile \ |