diff options
| author | Hussein Ait -Lahcen <44173825+haitlahcen@users.noreply.github.com> | 2018-11-05 10:32:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 10:32:10 +0100 |
| commit | 3873defb784f67ae419f93cdcfa25e655060ad76 (patch) | |
| tree | 44d7fabcc6f4a07f76e995e386d05264a40bff7d | |
| parent | 7a524a48c137ec0941c62bb010c2cdf37ed00826 (diff) | |
| parent | ec248bf43128c30346de2da5576cf87cd73fabb8 (diff) | |
| download | docker-nix-3873defb784f67ae419f93cdcfa25e655060ad76.tar.gz docker-nix-3873defb784f67ae419f93cdcfa25e655060ad76.tar.zst docker-nix-3873defb784f67ae419f93cdcfa25e655060ad76.zip | |
Merge pull request #4 from haitlahcen/stable-nixpkgs2.1.3-2
fix: pin unstable nixpkgs to latest stable release (18.09)
| -rw-r--r-- | alpine/Dockerfile | 4 | ||||
| -rw-r--r-- | debian/Dockerfile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5aa7fcc..1bf3a3b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile | |||
| @@ -27,8 +27,8 @@ 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-unstable \ | 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ |
| 31 | && nix-channel --update | 31 | && nix-channel --update |
| 32 | 32 | ||
| 33 | # Propagate UTF8 | 33 | # Propagate UTF8 |
| 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 | 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 |
diff --git a/debian/Dockerfile b/debian/Dockerfile index 6c09f82..70e36fc 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile | |||
| @@ -27,8 +27,8 @@ 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-unstable \ | 30 | RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ |
| 31 | && nix-channel --update | 31 | && nix-channel --update |
| 32 | 32 | ||
| 33 | # Propagate UTF8 | 33 | # Propagate UTF8 |
| 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 | 34 | # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 |