From 1e20ed5a0c00623409d25534dd00ea707b2c7dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 8 May 2018 12:28:06 +0200 Subject: [PATCH 1/4] Dockerfile: update to 2.0.1 --- misc/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 2f8e3dd7a..f655f1a56 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.1/nix-2.0.1-x86_64-linux.tar.bz2 \ + && echo "8b8f0b8d3912273b037dcc51497df7bbc9529dbad48aeadf322ca27c4c4c7a90 nix-2.0.1-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 \ From 257c3c763a1cc2d400f12d9d7e2895df8aa2d894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 8 May 2018 12:28:29 +0200 Subject: [PATCH 2/4] Add README for docker --- misc/docker/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 misc/docker/README.md diff --git a/misc/docker/README.md b/misc/docker/README.md new file mode 100644 index 000000000..87dd8713f --- /dev/null +++ b/misc/docker/README.md @@ -0,0 +1,10 @@ +To update https://hub.docker.com/r/nixos/nix/ + + $ docker build . + $ docker image ls + $ docker tag nixos/nix:2.0 + $ docker tag nixos/nix:latest + $ docker push nixos/nix:latest + $ docker push nixos/nix:2.0 + +Write access: @domenkozar From 85f9650322e762db8a14daa15aee508cfc5e2d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 8 May 2018 12:37:43 +0200 Subject: [PATCH 3/4] Dockerfile: 2.0.2 --- misc/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index f655f1a56..0f69d02df 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.1/nix-2.0.1-x86_64-linux.tar.bz2 \ - && echo "8b8f0b8d3912273b037dcc51497df7bbc9529dbad48aeadf322ca27c4c4c7a90 nix-2.0.1-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 \ From 2228891260ad9f35b5f8267f9f12aca3509e5d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 8 May 2018 12:37:52 +0200 Subject: [PATCH 4/4] docker readme: simplify --- misc/docker/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/misc/docker/README.md b/misc/docker/README.md index 87dd8713f..491be7408 100644 --- a/misc/docker/README.md +++ b/misc/docker/README.md @@ -1,9 +1,7 @@ To update https://hub.docker.com/r/nixos/nix/ - $ docker build . - $ docker image ls - $ docker tag nixos/nix:2.0 - $ docker tag nixos/nix:latest + $ 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