Merge pull request #5632 from NixOS/downloadable-docker-image

Make docker image downloadable in Hydra UI

1 files changed, 12 insertions, 3 deletions

diff --git a/flake.nix b/flake.nix
index 01afc23c3..1b98b526e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -407,10 +407,18 @@
 
         # docker image with Nix inside
         dockerImage = nixpkgs.lib.genAttrs linux64BitSystems (system:
-          import ./docker.nix {
+          let
             pkgs = nixpkgsFor.${system};
-            tag = version;
-          });
+            image = import ./docker.nix { inherit pkgs; tag = version; };
+          in pkgs.runCommand "docker-image-tarball-${version}"
+            { meta.description = "Docker image with Nix for ${system}";
+            }
+            ''
+              mkdir -p $out/nix-support
+              image=$out/image.tar.gz
+              ln -s ${image} $image
+              echo "file binary-dist $image" >> $out/nix-support/hydra-build-products
+            '');
 
         # Line coverage analysis.
         coverage =
@@ -516,6 +524,7 @@
         binaryTarball = self.hydraJobs.binaryTarball.${system};
         perlBindings = self.hydraJobs.perlBindings.${system};
         installTests = self.hydraJobs.installTests.${system};
+        dockerImage = self.hydraJobs.dockerImage.${system};
       });
 
       packages = forAllSystems (system: {