about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-06-21T19·33+0200
committerGitHub <noreply@github.com>2018-06-21T19·33+0200
commit6924bdf2bf8f50f2e6ec5d490571594450aba13a (patch)
tree3e2dc68488201dbbdfee534f5a6d6710b96a5aef
parent629398d05cc7ed42d0b676b2f02ee8985d2668be (diff)
parent81261ca5381eb503b27a529bb9d35383e79f98b8 (diff)
Merge pull request #2243 from peti/master
docker: move the docker file to https://github.com/NixOS/docker
-rw-r--r--misc/docker/Dockerfile28
-rw-r--r--misc/docker/README.md8
2 files changed, 0 insertions, 36 deletions
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
deleted file mode 100644
index eeca12353d98..000000000000
--- a/misc/docker/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM alpine
-
-# Enable HTTPS support in wget.
-RUN apk add --update openssl
-
-# Download Nix and install it into the system.
-RUN wget https://nixos.org/releases/nix/nix-2.0.4/nix-2.0.4-x86_64-linux.tar.bz2 \
-  && echo "d6db178007014ed47ad5460c1bd5b2cb9403b1ec543a0d6507cb27e15358341f  nix-2.0.4-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 \
-  && mkdir -m 0755 /nix && USER=root sh nix-*-x86_64-linux/install \
-  && 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=/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=/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
diff --git a/misc/docker/README.md b/misc/docker/README.md
deleted file mode 100644
index 491be7408964..000000000000
--- a/misc/docker/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-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