diff options
| author | Terin Stock <terinjokes@gmail.com> | 2020-12-11 18:54:44 -0800 |
|---|---|---|
| committer | Terin Stock <terinjokes@gmail.com> | 2020-12-15 02:14:01 -0800 |
| commit | 8f66dc94a751bf212c8e6541796025bfeabb87dd (patch) | |
| tree | 425239c820ea6a26ead48a412f4bc6ddca645b97 /nixos/tests/docker-tools.nix | |
| parent | 46e2a315adebe1b67dfcf83769e9597efc2ccf4d (diff) | |
| download | nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar.gz nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar.bz2 nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar.lz nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar.xz nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.tar.zst nixpkgs-8f66dc94a751bf212c8e6541796025bfeabb87dd.zip | |
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
Diffstat (limited to 'nixos/tests/docker-tools.nix')
| -rw-r--r-- | nixos/tests/docker-tools.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 3d1e39a379c..8402ba68b72 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -245,7 +245,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker inspect ${pkgs.dockerTools.examples.cross.imageName} " + "| ${pkgs.jq}/bin/jq -r .[].Architecture" ).strip() - == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64v8"}" + == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}" ) ''; }) |