dockerTools: allowing architecture to be specified

... for buildImage, buildLayeredImage and streamLayeredImage,
adding docs and tests.

1 files changed, 14 insertions, 0 deletions

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index e76a46131929d..71ef9ecc5d7bd 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -419,6 +419,20 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             "docker rmi layered-image-with-path",
         )
 
+    with subtest("Ensure correct architecture is present in manifests."):
+        docker.succeed(
+            "docker load --input='${examples.build-image-with-architecture}'",
+            "docker inspect ${examples.build-image-with-architecture} "
+              + "| ${pkgs.jq}/bin/jq -er '.[] | select(.Architecture=="arm64").Architecture'",
+            "docker rmi build-image-with-architecture",
+        )
+        docker.succeed(
+            "${examples.layered-image-with-architecture} | docker load",
+            "docker inspect ${examples.layered-image-with-architecture} "
+              + "| ${pkgs.jq}/bin/jq -er '.[] | select(.Architecture=="arm64").Architecture'",
+            "docker rmi layered-image-with-architecture",
+        )
+
     with subtest("etc"):
         docker.succeed("${examples.etc} | docker load")
         docker.succeed("docker run --rm etc | grep localhost")