JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #68898 from nspin/pr/docker-image-cross

Browse Source 
build-support/docker: set default image arch to host arch
This commit is contained in:
Matthew Bauer 2019-09-17 18:04:59 -04:00 committed by GitHub
commit b32fd0c093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/docker/default.nix
View File

@ -1,4 +1,5 @@
{ {
buildPackages,
cacert, cacert,
callPackage, callPackage,
closureInfo, closureInfo,
@ -47,7 +48,7 @@ rec {
, imageDigest , imageDigest
, sha256 , sha256
, os ? "linux" , os ? "linux"
, arch ? "amd64" , arch ? buildPackages.go.GOARCH
# This is used to set name to the pulled image # This is used to set name to the pulled image
, finalImageName ? imageName , finalImageName ? imageName
@ -540,7 +541,7 @@ rec {
configJson = let configJson = let
pure = writeText "${baseName}-config.json" (builtins.toJSON { pure = writeText "${baseName}-config.json" (builtins.toJSON {
inherit created config; inherit created config;
architecture = "amd64"; architecture = buildPackages.go.GOARCH;
os = "linux"; os = "linux";
}); });
impure = runCommand "${baseName}-standard-dynamic-date.json" impure = runCommand "${baseName}-standard-dynamic-date.json"
@ -658,7 +659,7 @@ rec {
baseJson = let baseJson = let
pure = writeText "${baseName}-config.json" (builtins.toJSON { pure = writeText "${baseName}-config.json" (builtins.toJSON {
inherit created config; inherit created config;
architecture = "amd64"; architecture = buildPackages.go.GOARCH;
os = "linux"; os = "linux";
}); });
impure = runCommand "${baseName}-config.json" impure = runCommand "${baseName}-config.json"