Merge pull request #6 from paulrbr-fl/upgrade-nix2.3.1-channel-19.09

Upgrade: nix to latest v2.3.1 and upgrade channel to stable 19.09
author: paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> 2019-12-10 09:52:45 +0100
committer: GitHub <noreply@github.com> 2019-12-10 09:52:45 +0100
commit: c17ecb7e7616a5b01908cf6d3dde42f5bb090a67 (patch)
tree: 0151c6f8970d6e056a8f5a8000b872b99c69da97
parent: 9b801ac92ca4d6ae7095b8ce510da61dfce961de (diff)
parent: 788f0fc53f4ff1692ea2e0280843f8b86779e1cf (diff)
download: docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.tar.gz
docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.tar.zst
docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.zip
2 files changed, 10 insertions, 10 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index c5d07b2..1b3d229 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
 FROM alpine
 ARG NIX_VERSION
-ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
+ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
 ARG LANG
 ENV LANG ${LANG:-"en_US.UTF-8"}
@@ -10,7 +10,7 @@ RUN addgroup -g 30000 -S nixbld \
    && for i in $(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user $i" -u $((30000 + i)) -G nixbld nixbld$i ; done \
    && adduser -D nixuser \
    && mkdir -m 0755 /nix && chown nixuser /nix \
-    && apk add --no-cache bash \
+    && apk add --no-cache bash xz \
    && rm -rf /var/cache/apk/* \
    # sandboxing enabled by default since 2.2
    && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
@@ -19,8 +19,8 @@ USER nixuser
 ENV USER=nixuser
 ENV HOME="/home/nixuser"
-RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.bz2 \
+RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.xz \
-    && tar xjf nix-*-x86_64-linux.tar.bz2 \
+    && tar xJf nix-*-x86_64-linux.tar.xz \
    && ~/nix-*-x86_64-linux/install \
    && rm -rf ~/nix-*-*
@@ -29,7 +29,7 @@ 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-19.03-darwin nixpkgs \
+RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \
    && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
    && nix-channel --update
diff --git a/debian/Dockerfile b/debian/Dockerfile
index f7034d2..5c4c46f 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -2,7 +2,7 @@
 FROM debian:stable-slim
 ARG NIX_VERSION
-ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
+ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
 ARG LANG
 ENV LANG ${LANG:-"en_US.UTF-8"}
@@ -10,7 +10,7 @@ RUN addgroup --gid 30000 --system nixbld \
    && for i in $(seq 1 30); do adduser --system --disabled-password --home /var/empty --gecos "Nix build user $i" --uid $((30000 + i)) --ingroup nixbld nixbld$i ; done \
    && adduser --disabled-password nixuser \
    && mkdir -m 0755 /nix && chown nixuser /nix \
-    && apt update && apt install -y wget bzip2 \
+    && apt update && apt install -y wget xz-utils \
    && 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
@@ -19,8 +19,8 @@ USER nixuser
 ENV USER=nixuser
 ENV HOME="/home/nixuser"
-RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.bz2 \
+RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.xz \
-    && tar xjf nix-*-x86_64-linux.tar.bz2 \
+    && tar xJf nix-*-x86_64-linux.tar.xz \
    && ~/nix-*-x86_64-linux/install \
    && rm -rf ~/nix-*-*
@@ -29,7 +29,7 @@ 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-19.03-darwin nixpkgs \
+RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \
    && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
    && nix-channel --update
author	paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>	2019-12-10 09:52:45 +0100
committer	GitHub <noreply@github.com>	2019-12-10 09:52:45 +0100
commit	c17ecb7e7616a5b01908cf6d3dde42f5bb090a67 (patch)
tree	0151c6f8970d6e056a8f5a8000b872b99c69da97
parent	9b801ac92ca4d6ae7095b8ce510da61dfce961de (diff)
parent	788f0fc53f4ff1692ea2e0280843f8b86779e1cf (diff)
download	docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.tar.gz docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.tar.zst docker-nix-c17ecb7e7616a5b01908cf6d3dde42f5bb090a67.zip

diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c5d07b2..1b3d229 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.2.1}	5	ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
6	ARG LANG	6	ARG LANG
7	ENV LANG ${LANG:-"en_US.UTF-8"}	7	ENV LANG ${LANG:-"en_US.UTF-8"}
8		8
@@ -10,7 +10,7 @@ RUN addgroup -g 30000 -S nixbld \
10	&& for i in $(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user $i" -u $((30000 + i)) -G nixbld nixbld$i ; done \	10	&& for i in $(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user $i" -u $((30000 + i)) -G nixbld nixbld$i ; done \
11	&& adduser -D nixuser \	11	&& adduser -D nixuser \
12	&& mkdir -m 0755 /nix && chown nixuser /nix \	12	&& mkdir -m 0755 /nix && chown nixuser /nix \
13	&& apk add --no-cache bash \	13	&& apk add --no-cache bash xz \
14	&& rm -rf /var/cache/apk/* \	14	&& rm -rf /var/cache/apk/* \
15	# sandboxing enabled by default since 2.2	15	# sandboxing enabled by default since 2.2
16	&& mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf	16	&& mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
@@ -19,8 +19,8 @@ USER nixuser
19	ENV USER=nixuser	19	ENV USER=nixuser
20	ENV HOME="/home/nixuser"	20	ENV HOME="/home/nixuser"
21		21
22	RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.bz2 \	22	RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.xz \
23	&& tar xjf nix-*-x86_64-linux.tar.bz2 \	23	&& tar xJf nix-*-x86_64-linux.tar.xz \
24	&& ~/nix-*-x86_64-linux/install \	24	&& ~/nix-*-x86_64-linux/install \
25	&& rm -rf ~/nix--	25	&& rm -rf ~/nix--
26		26
@@ -29,7 +29,7 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile
29	# All subsequent "RUN" will use a login shell	29	# All subsequent "RUN" will use a login shell
30	SHELL ["/usr/bin/env", "bash", "-l", "-c"]	30	SHELL ["/usr/bin/env", "bash", "-l", "-c"]
31		31
32	RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \	32	RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \
33	&& nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \	33	&& nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
34	&& nix-channel --update	34	&& nix-channel --update
35		35


diff --git a/debian/Dockerfile b/debian/Dockerfile index f7034d2..5c4c46f 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.2.1}	5	ENV NIX_VERSION ${NIX_VERSION:-2.3.1}
6	ARG LANG	6	ARG LANG
7	ENV LANG ${LANG:-"en_US.UTF-8"}	7	ENV LANG ${LANG:-"en_US.UTF-8"}
8		8
@@ -10,7 +10,7 @@ RUN addgroup --gid 30000 --system nixbld \
10	&& for i in $(seq 1 30); do adduser --system --disabled-password --home /var/empty --gecos "Nix build user $i" --uid $((30000 + i)) --ingroup nixbld nixbld$i ; done \	10	&& for i in $(seq 1 30); do adduser --system --disabled-password --home /var/empty --gecos "Nix build user $i" --uid $((30000 + i)) --ingroup nixbld nixbld$i ; done \
11	&& adduser --disabled-password nixuser \	11	&& adduser --disabled-password nixuser \
12	&& mkdir -m 0755 /nix && chown nixuser /nix \	12	&& mkdir -m 0755 /nix && chown nixuser /nix \
13	&& apt update && apt install -y wget bzip2 \	13	&& apt update && apt install -y wget xz-utils \
14	&& apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \	14	&& apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
15	# sandboxing enabled by default since 2.2	15	# sandboxing enabled by default since 2.2
16	&& mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf	16	&& mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
@@ -19,8 +19,8 @@ USER nixuser
19	ENV USER=nixuser	19	ENV USER=nixuser
20	ENV HOME="/home/nixuser"	20	ENV HOME="/home/nixuser"
21		21
22	RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.bz2 \	22	RUN cd && wget https://nixos.org/releases/nix/nix-$NIX_VERSION/nix-$NIX_VERSION-x86_64-linux.tar.xz \
23	&& tar xjf nix-*-x86_64-linux.tar.bz2 \	23	&& tar xJf nix-*-x86_64-linux.tar.xz \
24	&& ~/nix-*-x86_64-linux/install \	24	&& ~/nix-*-x86_64-linux/install \
25	&& rm -rf ~/nix--	25	&& rm -rf ~/nix--
26		26
@@ -29,7 +29,7 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile
29	# All subsequent "RUN" will use a login shell	29	# All subsequent "RUN" will use a login shell
30	SHELL ["/usr/bin/env", "bash", "-l", "-c"]	30	SHELL ["/usr/bin/env", "bash", "-l", "-c"]
31		31
32	RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \	32	RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.09-darwin nixpkgs \
33	&& nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \	33	&& nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
34	&& nix-channel --update	34	&& nix-channel --update
35		35