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

Make docker image downloadable in Hydra UI
This commit is contained in:
Eelco Dolstra 2021-11-24 11:12:53 +01:00 committed by GitHub
commit 585e97fa51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -407,10 +407,18 @@
# docker image with Nix inside # docker image with Nix inside
dockerImage = nixpkgs.lib.genAttrs linux64BitSystems (system: dockerImage = nixpkgs.lib.genAttrs linux64BitSystems (system:
import ./docker.nix { let
pkgs = nixpkgsFor.${system}; 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. # Line coverage analysis.
coverage = coverage =
@ -516,6 +524,7 @@
binaryTarball = self.hydraJobs.binaryTarball.${system}; binaryTarball = self.hydraJobs.binaryTarball.${system};
perlBindings = self.hydraJobs.perlBindings.${system}; perlBindings = self.hydraJobs.perlBindings.${system};
installTests = self.hydraJobs.installTests.${system}; installTests = self.hydraJobs.installTests.${system};
dockerImage = self.hydraJobs.dockerImage.${system};
}); });
packages = forAllSystems (system: { packages = forAllSystems (system: {