diff options
| author | Ismaël Bouya <ismael.bouya@fretlink.com> | 2020-12-17 14:52:08 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@fretlink.com> | 2020-12-17 15:03:25 +0100 |
| commit | d7db3dbcf09fe8940319777df11c956bb78dddd7 (patch) | |
| tree | cad6863a86adc9dae33466b9d5046ced3773cb20 | |
| parent | 62b9189f2da7d9b0804f38d564a1efed1e5db0fe (diff) | |
| download | docker-nix-d7db3dbcf09fe8940319777df11c956bb78dddd7.tar.gz docker-nix-d7db3dbcf09fe8940319777df11c956bb78dddd7.tar.zst docker-nix-d7db3dbcf09fe8940319777df11c956bb78dddd7.zip | |
Upgrade nix version
| -rw-r--r-- | alpine/Dockerfile | 5 | ||||
| -rw-r--r-- | debian/Dockerfile | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f6ea60c..db794af 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.4} | 5 | ENV NIX_VERSION ${NIX_VERSION:-2.3.9} |
| 6 | ARG LANG | 6 | ARG LANG |
| 7 | ENV LANG ${LANG:-"en_US.UTF-8"} | 7 | ENV LANG ${LANG:-"en_US.UTF-8"} |
| 8 | 8 | ||
| @@ -32,8 +32,7 @@ SHELL ["/usr/bin/env", "bash", "-l", "-c"] | |||
| 32 | # Create bash profile | 32 | # Create bash profile |
| 33 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile | 33 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile |
| 34 | 34 | ||
| 35 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \ | 35 | RUN nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs \ |
| 36 | && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ | ||
| 37 | && nix-channel --update | 36 | && nix-channel --update |
| 38 | 37 | ||
| 39 | # Propagate UTF8 | 38 | # Propagate UTF8 |
diff --git a/debian/Dockerfile b/debian/Dockerfile index edc605c..632a741 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | FROM debian:stable-slim | 2 | FROM debian:stable-slim |
| 3 | 3 | ||
| 4 | ARG NIX_VERSION | 4 | ARG NIX_VERSION |
| 5 | ENV NIX_VERSION ${NIX_VERSION:-2.3.4} | 5 | ENV NIX_VERSION ${NIX_VERSION:-2.3.9} |
| 6 | ARG LANG | 6 | ARG LANG |
| 7 | ENV LANG ${LANG:-"en_US.UTF-8"} | 7 | ENV LANG ${LANG:-"en_US.UTF-8"} |
| 8 | 8 | ||
| @@ -32,8 +32,7 @@ SHELL ["/usr/bin/env", "bash", "-l", "-c"] | |||
| 32 | # Create bash profile | 32 | # Create bash profile |
| 33 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile | 33 | COPY --chown=nixuser:nixuser files/.profile ${HOME}/.profile |
| 34 | 34 | ||
| 35 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \ | 35 | RUN nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs \ |
| 36 | && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ | ||
| 37 | && nix-channel --update | 36 | && nix-channel --update |
| 38 | 37 | ||
| 39 | # Propagate UTF8 | 38 | # Propagate UTF8 |