diff --git a/flake.nix b/flake.nix index 415bd42..088e08d 100644 --- a/flake.nix +++ b/flake.nix @@ -32,23 +32,10 @@ mv dist $out ''; }; - - container = pkgs.dockerTools.buildImage { - name = "angestoepselt-site"; - tag = "latest"; - - config = { - Cmd = [ - "${pkgs.caddy}/bin/caddy" - "file-server" - "-root" "${site}" - ]; - }; - }; in rec { packages = { - inherit site container; + inherit site; # This package isn't actually the fully-built site, but rather a # derivation that contains the relevant programs (with correctly set up @@ -90,7 +77,25 @@ devShell = packages.devEnv; hydraJobs = { - container = packages.container; + inherit site; + + container = { site }: let + container = pkgs.dockerTools.buildImage { + name = "angestoepselt-site-container"; + tag = "latest"; + + config = { + Cmd = [ + "${pkgs.caddy}/bin/caddy" + "file-server" + "-root" "${site}" + ]; + }; + }; + in pkgs.runCommand "container" {} '' + mkdir -p $out/nix-support + echo "file none ${container}" > $out/nix-support/hydra-build-products + ''; }; }); in (base // {