From bb5827a6926dcd576e029459ed8e7e723d963616 Mon Sep 17 00:00:00 2001 From: mupdt <25388474+mupdt@users.noreply.github.com> Date: Fri, 18 Nov 2022 09:31:53 -0500 Subject: [PATCH] dockerTools: prefer local builds --- pkgs/build-support/docker/default.nix | 8 +++++++- pkgs/build-support/references-by-popularity/default.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index a3145e504f23..6b07865928e6 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -547,10 +547,14 @@ rec { pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; architecture = defaultArch; + preferLocalBuild = true; os = "linux"; }); impure = runCommand "${baseName}-config.json" - { nativeBuildInputs = [ jq ]; } + { + nativeBuildInputs = [ jq ]; + preferLocalBuild = true; + } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -925,6 +929,7 @@ rec { { inherit fromImage maxLayers created; imageName = lib.toLower name; + preferLocalBuild = true; passthru.imageTag = if tag != null then tag @@ -1015,6 +1020,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; + preferLocalBuild = true; passthru = passthru // { inherit (conf) imageTag; diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index 4cae2dcf3ca9..dfc25275f34c 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -5,6 +5,7 @@ path: runCommand "closure-paths" { exportReferencesGraph.graph = path; __structuredAttrs = true; + preferLocalBuild = true; PATH = "${coreutils}/bin:${python3}/bin"; builder = builtins.toFile "builder" ''