aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHussein Ait-Lahcen <hussein.ait-lahcen@fretlink.com>2019-03-22 11:34:32 +0100
committerHussein Ait-Lahcen <hussein.ait-lahcen@fretlink.com>2019-03-22 12:33:39 +0100
commite6f85a810ddb2986cd7aa2124d4b140c3d7941a2 (patch)
treeff88acc7bdf694f12c0195e8011440a704108e2d
parent4d15def706c2573bc6cabdda75deb15b8ee76c5e (diff)
downloaddocker-nix-e6f85a810ddb2986cd7aa2124d4b140c3d7941a2.tar.gz
docker-nix-e6f85a810ddb2986cd7aa2124d4b140c3d7941a2.tar.zst
docker-nix-e6f85a810ddb2986cd7aa2124d4b140c3d7941a2.zip
chore(nix-cli): upgrade from 2.1.3 to 2.2.1
-rw-r--r--alpine/Dockerfile6
-rw-r--r--debian/Dockerfile6
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 @@
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
diff --git a/debian/Dockerfile b/debian/Dockerfile
index d8e9b97..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