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: 0cb7962a12b6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1b35b3d3a776
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Dec 15, 2020

  1. dockerTools: normalize arch to GOARCH 

    Docker (via containerd) and the the OCI Image Configuration imply and
suggest, respectfully, that the architecture set in images matches those
of GOARCH in the Go Language document.

This changeset updates the implimentation of getArch in dockerTools to
return GOARCH values, to satisfy Docker.

Fixes: #106695
    @terinjokes
    terinjokes committed Dec 15, 2020
    Copy the full SHA
    8f66dc9 View commit details
    Browse the repository at this point in the history

  2. nixosTests.docker-tools-cross: init 

    Not everyone has a suitable remote builder set up, so the cross-compilation
tests that _include_ running the result are separate. That way, most people
can run the majority of the test suite without the extra setup.
    @roberth @terinjokes
    roberth authored and terinjokes committed Dec 15, 2020
    Copy the full SHA
    d4b7efe View commit details
    Browse the repository at this point in the history

  3. dockerTools: use go.GOARCH as default arch

    @roberth @terinjokes
    roberth authored and terinjokes committed Dec 15, 2020
    Copy the full SHA
    5cacf0f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #106703 from terinjokes/patches/dockerTools-getArch 

    dockerTools: normalize arch to GOARCH
    @roberth
    roberth committed Dec 15, 2020
    Copy the full SHA
    1b35b3d View commit details
    Browse the repository at this point in the history