From e6f85a810ddb2986cd7aa2124d4b140c3d7941a2 Mon Sep 17 00:00:00 2001
From: Hussein Ait-Lahcen <hussein.ait-lahcen@fretlink.com>
Date: Fri, 22 Mar 2019 11:34:32 +0100
Subject: chore(nix-cli): upgrade from 2.1.3 to 2.2.1

---
 alpine/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'alpine')

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 952e3ea..c5d07b2 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
 FROM alpine
 
 ARG NIX_VERSION
-ENV NIX_VERSION ${NIX_VERSION:-2.1.3}
+ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
 ARG LANG
 ENV LANG ${LANG:-"en_US.UTF-8"}
 
@@ -11,7 +11,9 @@ RUN addgroup -g 30000 -S nixbld \
     && adduser -D nixuser \
     && mkdir -m 0755 /nix && chown nixuser /nix \
     && apk add --no-cache bash \
-    && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/* \
+    # sandboxing enabled by default since 2.2
+    && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
 
 USER nixuser
 ENV USER=nixuser
-- 
cgit v1.2.3