Skip to content
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/nixpkgs
base: 2ce9d4f60cd1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2e98e0c0032f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 24, 2018

  1. dockerTools: fixes extraCommands for mkRootLayer. 

    The extraCommands was, previously, simply put in the body of the script
using nix expansion `${extraCommands}` (which looks exactly like bash
expansion!).

This causes issues like in #34779 where scripts will eventually create
invalid bash.

The solution is to use a script like `run-as-root`.

 * * *

Fixes #34779
    @samueldr
    samueldr committed May 24, 2018
    Configuration menu
    Copy the full SHA
    60737bd View commit details
    Browse the repository at this point in the history

  2. tests/docker-tools: Adds regression test for #34779

    @samueldr
    samueldr committed May 24, 2018
    Configuration menu
    Copy the full SHA
    902b059 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40947 from samueldr/fix/34779 

    dockerTools: fixes extraCommands for mkRootLayer.
    @nlewo
    nlewo committed May 24, 2018
    Configuration menu
    Copy the full SHA
    2e98e0c View commit details
    Browse the repository at this point in the history