aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--alpine/Dockerfile11
-rw-r--r--debian/Dockerfile11
3 files changed, 15 insertions, 9 deletions
diff --git a/README.md b/README.md
index 5232b85..2d56d76 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
4 4
5This image contains an installation of the [Nix package manager](https://nixos.org/nix/) installed as a single-user `nixuser`. 5This image contains an installation of the [Nix package manager](https://nixos.org/nix/) installed as a single-user `nixuser`.
6 6
7This is based on the unpublished Dockerfile of https://github.com/romcheck/nix. 7This is based on the unpublished Dockerfile previously available at https://github.com/romcheck/nix.
8 8
9Use this build to create your own customized images as follows: 9Use this build to create your own customized images as follows:
10 10
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 1bf3a3b..c5d07b2 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
2FROM alpine 2FROM alpine
3 3
4ARG NIX_VERSION 4ARG NIX_VERSION
5ENV NIX_VERSION ${NIX_VERSION:-2.1.3} 5ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
6ARG LANG 6ARG LANG
7ENV LANG ${LANG:-"en_US.UTF-8"} 7ENV LANG ${LANG:-"en_US.UTF-8"}
8 8
@@ -11,7 +11,9 @@ RUN addgroup -g 30000 -S nixbld \
11 && adduser -D nixuser \ 11 && adduser -D nixuser \
12 && mkdir -m 0755 /nix && chown nixuser /nix \ 12 && mkdir -m 0755 /nix && chown nixuser /nix \
13 && apk add --no-cache bash \ 13 && apk add --no-cache bash \
14 && rm -rf /var/cache/apk/* 14 && rm -rf /var/cache/apk/* \
15 # sandboxing enabled by default since 2.2
16 && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
15 17
16USER nixuser 18USER nixuser
17ENV USER=nixuser 19ENV USER=nixuser
@@ -27,8 +29,9 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile
27# All subsequent "RUN" will use a login shell 29# All subsequent "RUN" will use a login shell
28SHELL ["/usr/bin/env", "bash", "-l", "-c"] 30SHELL ["/usr/bin/env", "bash", "-l", "-c"]
29 31
30RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ 32RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \
31 && nix-channel --update 33 && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
34 && nix-channel --update
32 35
33# Propagate UTF8 36# Propagate UTF8
34# https://github.com/NixOS/nix/issues/599#issuecomment-153885553 37# https://github.com/NixOS/nix/issues/599#issuecomment-153885553
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 70e36fc..f7034d2 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -2,7 +2,7 @@
2FROM debian:stable-slim 2FROM debian:stable-slim
3 3
4ARG NIX_VERSION 4ARG NIX_VERSION
5ENV NIX_VERSION ${NIX_VERSION:-2.1.3} 5ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
6ARG LANG 6ARG LANG
7ENV LANG ${LANG:-"en_US.UTF-8"} 7ENV LANG ${LANG:-"en_US.UTF-8"}
8 8
@@ -11,7 +11,9 @@ RUN addgroup --gid 30000 --system nixbld \
11 && adduser --disabled-password nixuser \ 11 && adduser --disabled-password nixuser \
12 && mkdir -m 0755 /nix && chown nixuser /nix \ 12 && mkdir -m 0755 /nix && chown nixuser /nix \
13 && apt update && apt install -y wget bzip2 \ 13 && apt update && apt install -y wget bzip2 \
14 && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 14 && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
15 # sandboxing enabled by default since 2.2
16 && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
15 17
16USER nixuser 18USER nixuser
17ENV USER=nixuser 19ENV USER=nixuser
@@ -27,8 +29,9 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile
27# All subsequent "RUN" will use a login shell 29# All subsequent "RUN" will use a login shell
28SHELL ["/usr/bin/env", "bash", "-l", "-c"] 30SHELL ["/usr/bin/env", "bash", "-l", "-c"]
29 31
30RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ 32RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \
31 && nix-channel --update 33 && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
34 && nix-channel --update
32 35
33# Propagate UTF8 36# Propagate UTF8
34# https://github.com/NixOS/nix/issues/599#issuecomment-153885553 37# https://github.com/NixOS/nix/issues/599#issuecomment-153885553