diff options
-rw-r--r-- | alpine/Dockerfile | 6 | ||||
-rw-r--r-- | debian/Dockerfile | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 952e3ea..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 |
diff --git a/debian/Dockerfile b/debian/Dockerfile index d8e9b97..f7034d2 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile | |||
@@ -2,7 +2,7 @@ | |||
2 | FROM debian:stable-slim | 2 | FROM debian:stable-slim |
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 --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 | ||
16 | USER nixuser | 18 | USER nixuser |
17 | ENV USER=nixuser | 19 | ENV USER=nixuser |