diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-05-10T09·56+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10T09·56+0200 |
| commit | 5ba2b566a4d3f2ed92c0fb3defebaeec9cef262c (patch) | |
| tree | 789bda9bbfd09c6dd6757923ecdb821fc29a2abf | |
| parent | a91c4ca01f720711d80a6f7d16ead70ce8f5f741 (diff) | |
| parent | 2228891260ad9f35b5f8267f9f12aca3509e5d73 (diff) | |
Merge pull request #2142 from domenkozar/docker-2.0.1
Docker 2.0.1
| -rw-r--r-- | misc/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | misc/docker/README.md | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 2f8e3dd7a679..0f69d02df25f 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -4,8 +4,8 @@ FROM alpine RUN apk add --update openssl # Download Nix and install it into the system. -RUN wget https://nixos.org/releases/nix/nix-2.0/nix-2.0-x86_64-linux.tar.bz2 \ - && echo "6312837aee33306cdbb351b75ba1638b89d21b30f0caf0346f9a742425f197ee nix-2.0-x86_64-linux.tar.bz2" | sha256sum -c \ +RUN wget https://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2-x86_64-linux.tar.bz2 \ + && echo "d0c2492d7d8f824e3b1ace15a1a58f64a0a8faacc59936ebedfe18905d982d7c nix-2.0.2-x86_64-linux.tar.bz2" | sha256sum -c \ && tar xjf nix-*-x86_64-linux.tar.bz2 \ && 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 \ diff --git a/misc/docker/README.md b/misc/docker/README.md new file mode 100644 index 000000000000..491be7408964 --- /dev/null +++ b/misc/docker/README.md @@ -0,0 +1,8 @@ +To update https://hub.docker.com/r/nixos/nix/ + + $ docker build . -t nixos/nix:2.0 + $ docker tag nixos/nix:2.0 nixos/nix:latest + $ docker push nixos/nix:latest + $ docker push nixos/nix:2.0 + +Write access: @domenkozar |