Skip to content
This repository has been 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
base: e166d64ce3ac
Choose a base ref
...
head repository: NixOS/docker
compare: b9d6e26163e7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 21, 2018

  1. travis.yml: verify that the generated image works

    @peti
    peti committed Jun 21, 2018
    Copy the full SHA
    c8a3299 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Revert "Drop hard-coded $PATH, $GIT_SSL_CAINFO, $NIX_SSL_CERT_FILE, a… 

    …nd $NIX_PATH values from ENV."

This reverts commit e166d64. I assumed
incorrectly that these settings are unnecessary, but in fact they are required
so that users can execute nix commands *directly*, without going through a
shell:

    $ docker run -it --rm nixos/nix nix-channel --list
    Error response from daemon:
    OCI runtime create failed:
    starting container process caused "exec: \"nix-channel\":
    executable file not found in $PATH": unknown.

Fixes #1. I am sorry about the
regression.
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    6a645be View commit details
    Browse the repository at this point in the history

  2. Verify that "docker run" can execute nix commands without a shell. 

    Avoids regressions like #1.
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    b9d6e26 View commit details
    Browse the repository at this point in the history