diff options
| author | Hussein Ait-Lahcen <hussein.ait-lahcen@fretlink.com> | 2019-03-22 11:16:58 +0100 |
|---|---|---|
| committer | Hussein Ait-Lahcen <hussein.ait-lahcen@fretlink.com> | 2019-03-22 11:35:10 +0100 |
| commit | 4d15def706c2573bc6cabdda75deb15b8ee76c5e (patch) | |
| tree | c2e15c6ef8bbb14a5286f6408ac3ba0a9670bf2c | |
| parent | 3873defb784f67ae419f93cdcfa25e655060ad76 (diff) | |
| download | docker-nix-4d15def706c2573bc6cabdda75deb15b8ee76c5e.tar.gz docker-nix-4d15def706c2573bc6cabdda75deb15b8ee76c5e.tar.zst docker-nix-4d15def706c2573bc6cabdda75deb15b8ee76c5e.zip | |
chore(nix-channel): upgrade from 18.09 to 19.03 and add special `unstable`
| -rw-r--r-- | alpine/Dockerfile | 5 | ||||
| -rw-r--r-- | debian/Dockerfile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 1bf3a3b..952e3ea 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile | |||
| @@ -27,8 +27,9 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile | |||
| 27 | # All subsequent "RUN" will use a login shell | 27 | # All subsequent "RUN" will use a login shell |
| 28 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] | 28 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] |
| 29 | 29 | ||
| 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ | 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \ |
| 31 | && nix-channel --update | 31 | && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ |
| 32 | && nix-channel --update | ||
| 32 | 33 | ||
| 33 | # Propagate UTF8 | 34 | # Propagate UTF8 |
| 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 | 35 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 |
diff --git a/debian/Dockerfile b/debian/Dockerfile index 70e36fc..d8e9b97 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile | |||
| @@ -27,8 +27,9 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile | |||
| 27 | # All subsequent "RUN" will use a login shell | 27 | # All subsequent "RUN" will use a login shell |
| 28 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] | 28 | SHELL ["/usr/bin/env", "bash", "-l", "-c"] |
| 29 | 29 | ||
| 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ | 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \ |
| 31 | && nix-channel --update | 31 | && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ |
| 32 | && nix-channel --update | ||
| 32 | 33 | ||
| 33 | # Propagate UTF8 | 34 | # Propagate UTF8 |
| 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 | 35 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 |