diff options
author | ismaelbouyaf <ismael.bouya@fretlink.com> | 2021-10-14 15:19:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-14 15:19:24 +0200 |
commit | 4df8cc27ddd7b8e36ca117f63a76c86447d21faa (patch) | |
tree | f78b742c9c045dba5a66052f1e9e6e1c924555b0 | |
parent | a2c9e219463ea33db5fd57ac178b459bc6d754b5 (diff) | |
parent | 516309b3450efd106238957987a66b1881fc8f5f (diff) | |
download | docker-nix-master.tar.gz docker-nix-master.tar.zst docker-nix-master.zip |
Merge pull request #11 from ismaelbouyaf/remove-sandbox-falseHEAD2.3.9-channel-unstable-2021-10-14master
Remove sandbox=false
-rw-r--r-- | alpine/Dockerfile | 3 | ||||
-rw-r--r-- | debian/Dockerfile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/alpine/Dockerfile b/alpine/Dockerfile index db794af..8d6431f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile | |||
@@ -12,8 +12,7 @@ RUN addgroup -g 30000 -S nixbld \ | |||
12 | && mkdir -m 0755 /nix && chown nixuser /nix \ | 12 | && mkdir -m 0755 /nix && chown nixuser /nix \ |
13 | && apk add --no-cache bash xz \ | 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 | && mkdir -p /etc/nix && touch /etc/nix/nix.conf |
16 | && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf | ||
17 | 16 | ||
18 | USER nixuser | 17 | USER nixuser |
19 | ENV USER=nixuser | 18 | ENV USER=nixuser |
diff --git a/debian/Dockerfile b/debian/Dockerfile index 632a741..336cd0d 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile | |||
@@ -12,8 +12,7 @@ RUN addgroup --gid 30000 --system nixbld \ | |||
12 | && mkdir -m 0755 /nix && chown nixuser /nix \ | 12 | && mkdir -m 0755 /nix && chown nixuser /nix \ |
13 | && apt update && apt install -y wget xz-utils \ | 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 | && mkdir -p /etc/nix && touch /etc/nix/nix.conf |
16 | && mkdir -p /etc/nix && echo 'sandbox = false' > /etc/nix/nix.conf | ||
17 | 16 | ||
18 | USER nixuser | 17 | USER nixuser |
19 | ENV USER=nixuser | 18 | ENV USER=nixuser |