aboutsummaryrefslogtreecommitdiffhomepage
path: root/alpine
diff options
context:
space:
mode:
authorHussein A <44173825+haitlahcen@users.noreply.github.com>2019-03-22 12:41:32 +0100
committerGitHub <noreply@github.com>2019-03-22 12:41:32 +0100
commit9b801ac92ca4d6ae7095b8ce510da61dfce961de (patch)
treec380b29934843d7880c81467f74c5f49a179b007 /alpine
parent3873defb784f67ae419f93cdcfa25e655060ad76 (diff)
parentf3feadbd827b5d03f09b6f91006e5745693674fd (diff)
downloaddocker-nix-9b801ac92ca4d6ae7095b8ce510da61dfce961de.tar.gz
docker-nix-9b801ac92ca4d6ae7095b8ce510da61dfce961de.tar.zst
docker-nix-9b801ac92ca4d6ae7095b8ce510da61dfce961de.zip
Merge pull request #5 from haitlahcen/upgrade-19.032.2.1-channel-19.03
Upgrade from 18.09 to 19.03
Diffstat (limited to 'alpine')
-rw-r--r--alpine/Dockerfile11
1 files changed, 7 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 1bf3a3b..c5d07b2 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
2FROM alpine 2FROM alpine
3 3
4ARG NIX_VERSION 4ARG NIX_VERSION
5ENV NIX_VERSION ${NIX_VERSION:-2.1.3} 5ENV NIX_VERSION ${NIX_VERSION:-2.2.1}
6ARG LANG 6ARG LANG
7ENV LANG ${LANG:-"en_US.UTF-8"} 7ENV LANG ${LANG:-"en_US.UTF-8"}
8 8
@@ -11,7 +11,9 @@ RUN addgroup -g 30000 -S nixbld \
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 \
14 && rm -rf /var/cache/apk/* 14 && rm -rf /var/cache/apk/* \
15 # sandboxing enabled by default since 2.2
16 && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf
15 17
16USER nixuser 18USER nixuser
17ENV USER=nixuser 19ENV USER=nixuser
@@ -27,8 +29,9 @@ RUN echo ". ${ENV}" >> ${HOME}/.profile
27# All subsequent "RUN" will use a login shell 29# All subsequent "RUN" will use a login shell
28SHELL ["/usr/bin/env", "bash", "-l", "-c"] 30SHELL ["/usr/bin/env", "bash", "-l", "-c"]
29 31
30RUN nix-channel --add https://nixos.org/channels/nixpkgs-18.09-darwin nixpkgs \ 32RUN nix-channel --add https://nixos.org/channels/nixpkgs-19.03-darwin nixpkgs \
31 && nix-channel --update 33 && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable \
34 && nix-channel --update
32 35
33# Propagate UTF8 36# Propagate UTF8
34# https://github.com/NixOS/nix/issues/599#issuecomment-153885553 37# https://github.com/NixOS/nix/issues/599#issuecomment-153885553