From 3e331d51d19f4335fa7c2583ce855d7acc1ece21 Mon Sep 17 00:00:00 2001
From: Paul Bonaud <paul.bonaud@fretlink.com>
Date: Mon, 4 May 2020 18:46:33 +0200
Subject: volume: no need to duplicate the initial nix store
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a partial revert of #7 where we added a copy of the initial
nix store to make sure it's not lost when we use a volume for the /nix
mounting point in the container.

However this was an unecessary duplication.

The initial nix store is already present in the docker image and can be
retrieved by using a “named” volume with `-v nix-store:/nix`, docker
will copy the /nix path of the image inside a volume called
`nix-store` on the host machine for us we don't need to it manually.

Of course if mounting an empty directory from the host machine (with
`-v /tmp/nix-store:/nix`) then the image won't boot (because docker
will NOT copy the content of the /nix path inside the image into the
/tmp/nix-store path of the host machine).

This change drastically reduces the image size (basically /2 as we
were duplicating the biggest source of disk space…)

```
REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
docker-nix          2.3.4-vol           f74209e25515        About a minute ago   1.58GB
docker-nix          2.3.4               61880484ceb1        12 minutes ago       835MB
```

Let's be 🍃 instead of ⛰️
---
 debian/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'debian')

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 90b2e65..7e4eaea 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -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
-- 
cgit v1.2.3


From e36f158f6547ea78da7926689cc6444f67b2a068 Mon Sep 17 00:00:00 2001
From: Paul Bonaud <paul.bonaud@fretlink.com>
Date: Mon, 4 May 2020 18:50:58 +0200
Subject: nix: upgrade from 2.3.1 to 2.3.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mostly bugfixes inside nix itself ✨
---
 debian/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 7e4eaea..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"}
 
-- 
cgit v1.2.3