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: 84cb90d690ec
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ec76904f3048
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 15, 2017

  1. openshift: 1.5.0 -> 3.6.0 

    - Updated from 1.5.0 to 3.6.0 (this is just the next version, but Red
  Hat did quite the version bump there)
- Added 'v' to the version; it is used by `oc cluster up` to determine
  which image should be downloaded.
- Added myself as a maintainer.

(cherry picked from commit f8a7266)
    @moretea @Mic92
    moretea authored and Mic92 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    57ae49b View commit details
    Browse the repository at this point in the history

  2. Fix oc cluster up 

    The command `oc cluster up` mainly runs code though Docker containers.

However, in pkg/bootstrap/docker/host/host.go, nsenter is used to run
some commands on the host. For this to work on NixOS, we need to provide
the absolute path to the required programs.

(cherry picked from commit a3dde77)
    @moretea @Mic92
    moretea authored and Mic92 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    d8f979d View commit details
    Browse the repository at this point in the history

  3. mount is in utillinux 

    (cherry picked from commit d27f710)
    @moretea @Mic92
    moretea authored and Mic92 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    ec76904 View commit details
    Browse the repository at this point in the history