diff options
Diffstat (limited to 'alpine/Dockerfile')
-rw-r--r-- | alpine/Dockerfile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 1bf3a3b..c5d07b2 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile | |||
@@ -2,7 +2,7 @@ | |||
2 | FROM alpine | 2 | FROM alpine |
3 | 3 | ||
4 | ARG NIX_VERSION | 4 | ARG NIX_VERSION |
5 | ENV NIX_VERSION ${NIX_VERSION:-2.1.3} | 5 | ENV NIX_VERSION ${NIX_VERSION:-2.2.1} |
6 | ARG LANG | 6 | ARG LANG |
7 | ENV LANG ${LANG:-"en_US.UTF-8"} | 7 | ENV 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 | ||
16 | USER nixuser | 18 | USER nixuser |
17 | ENV USER=nixuser | 19 | ENV 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 |
28 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] | 30 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] |
29 | 31 | ||
30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ | 32 | RUN 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 |