From 4d15def706c2573bc6cabdda75deb15b8ee76c5e Mon Sep 17 00:00:00 2001 From: Hussein Ait-Lahcen Date: Fri, 22 Mar 2019 11:16:58 +0100 Subject: chore(nix-channel): upgrade from 18.09 to 19.03 and add special `unstable` --- alpine/Dockerfile | 5 +++-- 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 # All subsequent "RUN" will use a login shell SHELL ["/usr/bin/env", "bash", "-l", "-c"] -RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ - && nix-channel --update +RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \ + && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ + && nix-channel --update # Propagate UTF8 # 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 # All subsequent "RUN" will use a login shell SHELL ["/usr/bin/env", "bash", "-l", "-c"] -RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ - && nix-channel --update +RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \ + && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \ + && nix-channel --update # Propagate UTF8 # https://github.com/NixOS/nix/issues/599#issuecomment-153885553 -- cgit v1.2.3 From e6f85a810ddb2986cd7aa2124d4b140c3d7941a2 Mon Sep 17 00:00:00 2001 From: Hussein Ait-Lahcen Date: Fri, 22 Mar 2019 11:34:32 +0100 Subject: chore(nix-cli): upgrade from 2.1.3 to 2.2.1 --- alpine/Dockerfile | 6 ++++-- debian/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 952e3ea..c5d07b2 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine ARG NIX_VERSION -ENV NIX_VERSION ${NIX_VERSION:-2.1.3} +ENV NIX_VERSION ${NIX_VERSION:-2.2.1} ARG LANG ENV LANG ${LANG:-"en_US.UTF-8"} @@ -11,7 +11,9 @@ RUN addgroup -g 30000 -S nixbld \ && adduser -D nixuser \ && mkdir -m 0755 /nix && chown nixuser /nix \ && apk add --no-cache bash \ - && rm -rf /var/cache/apk/* + && rm -rf /var/cache/apk/* \ + # sandboxing enabled by default since 2.2 + && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf USER nixuser ENV USER=nixuser diff --git a/debian/Dockerfile b/debian/Dockerfile index d8e9b97..f7034d2 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -2,7 +2,7 @@ FROM debian:stable-slim ARG NIX_VERSION -ENV NIX_VERSION ${NIX_VERSION:-2.1.3} +ENV NIX_VERSION ${NIX_VERSION:-2.2.1} ARG LANG ENV LANG ${LANG:-"en_US.UTF-8"} @@ -11,7 +11,9 @@ RUN addgroup --gid 30000 --system nixbld \ && adduser --disabled-password nixuser \ && mkdir -m 0755 /nix && chown nixuser /nix \ && apt update && apt install -y wget bzip2 \ - && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + # sandboxing enabled by default since 2.2 + && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf USER nixuser ENV USER=nixuser -- cgit v1.2.3 From f3feadbd827b5d03f09b6f91006e5745693674fd Mon Sep 17 00:00:00 2001 From: Hussein Ait-Lahcen Date: Fri, 22 Mar 2019 12:36:52 +0100 Subject: chore(readme): update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5232b85..2d56d76 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This image contains an installation of the [Nix package manager](https://nixos.org/nix/) installed as a single-user `nixuser`. -This is based on the unpublished Dockerfile of https://github.com/romcheck/nix. +This is based on the unpublished Dockerfile previously available at https://github.com/romcheck/nix. Use this build to create your own customized images as follows: -- cgit v1.2.3