Update Hydra jobs

This commit is contained in:
Yannik Rödel 2022-03-15 09:20:07 +01:00
parent b3aa8c9528
commit 30bf3ec76b

View file

@ -18,24 +18,37 @@
dontNpmInstall = true; dontNpmInstall = true;
}; };
site = pkgs.stdenv.mkDerivation {
name = "angestoepselt-site";
src = self;
buildInputs = [ nodejs nodeDependencies ];
buildPhase = ''
npm run build
'';
installPhase = ''
mv dist $out
'';
};
in in
rec { rec {
packages = { packages = {
inherit site; site = pkgs.stdenv.mkDerivation {
name = "angestoepselt-site";
src = self;
buildInputs = [ nodejs nodeDependencies ];
buildPhase = ''
npm run build
'';
installPhase = ''
mv dist $out
'';
};
container = pkgs.dockerTools.buildImage {
name = "angestoepselt-site-container";
tag = "latest";
config = {
Cmd = [
"${pkgs.caddy}/bin/caddy"
"file-server"
"-root" "${packages.site}"
];
};
};
# This package isn't actually the fully-built site, but rather a # This package isn't actually the fully-built site, but rather a
# derivation that contains the relevant programs (with correctly set up # derivation that contains the relevant programs (with correctly set up
@ -82,22 +95,11 @@
container = let container = let
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
containerFile = base.packages.x86_64-linux.container;
container = pkgs.dockerTools.buildImage {
name = "angestoepselt-site-container";
tag = "latest";
config = {
Cmd = [
"${pkgs.caddy}/bin/caddy"
"file-server"
"-root" "${site}"
];
};
};
in pkgs.runCommand "container" {} '' in pkgs.runCommand "container" {} ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo "file none ${container}" > $out/nix-support/hydra-build-products ln -s ${containerFile} $out/angestoepselt-site.tar.gz
echo "file oci $out/angestoepselt-site.tar.gz" > $out/nix-support/hydra-build-products
''; '';
}; };
}); });