diff options
| author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2020-05-04 22:05:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 22:05:18 +0200 |
| commit | 425ab813a99a2aec3c4ce5cc432356451aa343c3 (patch) | |
| tree | 14468b6b65b39ed6af970708550da80d42a4fa59 /alpine | |
| parent | 937d660cdc7b7b82cc6e75641ee6f21ff43e017a (diff) | |
| parent | e36f158f6547ea78da7926689cc6444f67b2a068 (diff) | |
| download | docker-nix-425ab813a99a2aec3c4ce5cc432356451aa343c3.tar.gz docker-nix-425ab813a99a2aec3c4ce5cc432356451aa343c3.tar.zst docker-nix-425ab813a99a2aec3c4ce5cc432356451aa343c3.zip | |
Merge pull request #8 from paulrbr-fl/upgrade-nix2.3.4-channel-19.09
Nix upgrade to 2.3.4 and volume management tweak
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/Dockerfile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 0e42345..2c4ae1f 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.3.1} | 5 | ENV NIX_VERSION ${NIX_VERSION:-2.3.4} |
| 6 | ARG LANG | 6 | ARG LANG |
| 7 | ENV LANG ${LANG:-"en_US.UTF-8"} | 7 | ENV LANG ${LANG:-"en_US.UTF-8"} |
| 8 | 8 | ||
| @@ -40,9 +40,6 @@ RUN nix-env -iA nixpkgs.glibcLocales | |||
| 40 | 40 | ||
| 41 | # < Nix context as a volume | 41 | # < Nix context as a volume |
| 42 | # We want to be able to define /nix/store as a volume | 42 | # We want to be able to define /nix/store as a volume |
| 43 | # We thus need to "save" the current nix context to be able | ||
| 44 | # to restore it at startup time | ||
| 45 | RUN cp -R /nix /home/nixuser/initial-nix | ||
| 46 | VOLUME ["/nix"] | 43 | VOLUME ["/nix"] |
| 47 | # Create bash profile | 44 | # Create bash profile |
| 48 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile | 45 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile |