Skip to content
This repository was archived by the owner on Dec 16, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 003412658ea4
Choose a base ref
...
head repository: NixOS/docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4965ab3b754
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 6, 2020

  1. Update to nix 2.3.4 

    This change also includes an addition of ARG instruction,
so the installed nix version could be easily changed via
docker build --build-arg NIX_VERSION=<version>
    @prusnak
    prusnak committed May 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    adb72e8 View commit details

  2. Merge pull request #16 from prusnak/nix-2.3.4 

    Update to nix 2.3.4
    @peti
    peti authored May 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d4965ab View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 Dockerfile
9 changes: 5 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,16 @@ RUN apk add --no-cache --update openssl \
&& echo hosts: dns files > /etc/nsswitch.conf

# Download Nix and install it into the system.
RUN wget https://nixos.org/releases/nix/nix-2.3/nix-2.3-x86_64-linux.tar.xz \
&& tar xf nix-2.3-x86_64-linux.tar.xz \
ARG NIX_VERSION=2.3.4
RUN wget https://nixos.org/releases/nix/nix-${NIX_VERSION}/nix-${NIX_VERSION}-x86_64-linux.tar.xz \
&& tar xf nix-${NIX_VERSION}-x86_64-linux.tar.xz \
&& 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 \
&& mkdir -m 0755 /etc/nix \
&& echo 'sandbox = false' > /etc/nix/nix.conf \
&& mkdir -m 0755 /nix && USER=root sh nix-*-x86_64-linux/install \
&& mkdir -m 0755 /nix && USER=root sh nix-${NIX_VERSION}-x86_64-linux/install \
&& ln -s /nix/var/nix/profiles/default/etc/profile.d/nix.sh /etc/profile.d/ \
&& rm -r /nix-*-x86_64-linux* \
&& rm -r /nix-${NIX_VERSION}-x86_64-linux* \
&& rm -rf /var/cache/apk/* \
&& /nix/var/nix/profiles/default/bin/nix-collect-garbage --delete-old \
&& /nix/var/nix/profiles/default/bin/nix-store --optimise \