diff options
| author | Nick Spinale <nick@nickspinale.com> | 2019-09-10 23:02:19 +0000 |
|---|---|---|
| committer | Nick Spinale <nick@nickspinale.com> | 2019-09-16 14:22:30 +0000 |
| commit | 8166bc934b254d61ea059f63764632fc2785d9da (patch) | |
| tree | d8118c2f54e3928889da384fefc6f52a1d44b61b /pkgs/build-support/docker | |
| parent | 37e333af9a18814537b872745d9b1c580c1b1a9d (diff) | |
| download | nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar.gz nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar.bz2 nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar.lz nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar.xz nixlib-8166bc934b254d61ea059f63764632fc2785d9da.tar.zst nixlib-8166bc934b254d61ea059f63764632fc2785d9da.zip | |
build-support/docker: set default image arch to host arch
The architecture of an image should default to the architecture for which that image is being composed or pulled. buildPackages.go.GOARCH is an easy way to compute that architecture with the correct terminology.
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83e21c8945dc..37b25232b961 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,4 +1,5 @@ { + buildPackages, cacert, callPackage, closureInfo, @@ -47,7 +48,7 @@ rec { , imageDigest , sha256 , os ? "linux" - , arch ? "amd64" + , arch ? buildPackages.go.GOARCH # This is used to set name to the pulled image , finalImageName ? imageName @@ -540,7 +541,7 @@ rec { configJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" @@ -658,7 +659,7 @@ rec { baseJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-config.json" |