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: 431d05cff731
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0f78afdf253e
Choose a head ref
  • 11 commits
  • 11 files changed
  • 3 contributors

Commits on Dec 2, 2017

  1. docker: init fetchdocker nix code for docker2nix

    This change adds granular, non-docker daemon docker image fetchers and
    a docker image layer compositor to be used in conjunction with the
    `docker2nix` utility provided by the `haskellPackages.hocker` package.
    
    This change includes a hackage package version bump and updated sha256
    for recent fixes released to `hocker` resulting from formulating this
    patch.
    ixmatus committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    2586568 View commit details
    Browse the repository at this point in the history
  2. fetchdocker: Integration test exercising hocker and fetchdocker

    This change adds a simple integration test exercising the fetchdocker
    Nix code and hocker utilities for the simple `hello-world` docker
    container. We exercise:
    
    - Fetching the docker image configuration json
    - Fetching the docker image layers
    - Building a compositor script
    - Loading the `hello-world` docker image into docker using the
      compositor script and `docker load`
    - Running that loaded container
    ixmatus committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    c1eb962 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6c9de3f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a6cdf0a View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Configuration menu
    Copy the full SHA
    e4ec980 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Configuration menu
    Copy the full SHA
    bd9869d View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Configuration menu
    Copy the full SHA
    c2a5f68 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. Configuration menu
    Copy the full SHA
    6f95cb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Configuration menu
    Copy the full SHA
    0a603ee View commit details
    Browse the repository at this point in the history
  2. Merge branch 'parnell/fetchdocker' of github.com:awakesecurity/nixpkg…

    …s into parnell/fetchdocker
    ixmatus committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    58895aa View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2018

  1. Merge pull request #32248 from awakesecurity/parnell/fetchdocker

    Support fetching docker images from V2 registries
    fpletz committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    0f78afd View commit details
    Browse the repository at this point in the history