Merge pull request #8 from paulrbr-fl/upgrade-nix2.3.4-channel-19.09

Nix upgrade to 2.3.4 and volume management tweak

3 files changed, 2 insertions, 11 deletions

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 0e42345..2c4ae1f 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
 FROM alpine
 
 ARG NIX_VERSION
-ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
+ENV NIX_VERSION ${NIX_VERSION:-2.3.4}
 ARG LANG
 ENV LANG ${LANG:-"en_US.UTF-8"}
 
@@ -40,9 +40,6 @@ RUN nix-env -iA nixpkgs.glibcLocales
 
 # < Nix context as a volume
 # We want to be able to define /nix/store as a volume
-# We thus need to "save" the current nix context to be able
-# to restore it at startup time
-RUN cp -R /nix /home/nixuser/initial-nix
 VOLUME ["/nix"]
 # Create bash profile
 COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 90b2e65..e5d410e 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -2,7 +2,7 @@
 FROM debian:stable-slim
 
 ARG NIX_VERSION
-ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
+ENV NIX_VERSION ${NIX_VERSION:-2.3.4}
 ARG LANG
 ENV LANG ${LANG:-"en_US.UTF-8"}
 
@@ -40,9 +40,6 @@ RUN nix-env -iA nixpkgs.glibcLocales
 
 # < Nix context as a volume
 # We want to be able to define /nix/store as a volume
-# We thus need to "save" the current nix context to be able
-# to restore it at startup time
-RUN cp -R /nix /home/nixuser/initial-nix
 VOLUME ["/nix"]
 # Create bash profile
 COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile
diff --git a/files/.profile b/files/.profile
index 68b4473..2fadec2 100755
--- a/files/.profile
+++ b/files/.profile
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# Copy initial saved nix context if the /nix is empty
-[ ! "$(ls -A /nix)" ] && cp -R ~/initial-nix/* /nix/
-
 # Source nix environment
 nix_profile="/home/nixuser/.nix-profile/etc/profile.d/nix.sh"
 # shellcheck source=/home/nixuser/.nix-profile/etc/profile.d/nix.sh