all repos — website @ cd1125a213d742b5a89e8b60f0c7aafef13b8783

My website

fetch and build site on server start

Alan Pearce
commit

cd1125a213d742b5a89e8b60f0c7aafef13b8783

parent

83a4eef89b9906d8ad90411e9b256da6dab07b55

1 file changed, 5 insertions(+), 43 deletions(-)

changed files
M default.nixdefault.nix
@@ -14,7 +14,7 @@ lib
runCommandLocal; version = "unstable"; - mkDocker = type: { server, website, architecture ? pkgs.go.GOARCH }: + mkDocker = type: { server, architecture ? pkgs.go.GOARCH }: pkgs.dockerTools.${type} { name = "registry.fly.io/alanpearce-eu"; contents = with pkgs; [
@@ -26,10 +26,10 @@ Cmd = [ "${server}/bin/server" ];
Env = [ "PRODUCTION=true" "LISTEN_ADDRESS=::" - "ROOT=." + "ROOT=/data" "PORT=80" ]; - WorkingDir = website; + WorkingDir = "/data"; ExposedPorts = { "80/tcp" = { }; "443/tcp" = { };
@@ -61,42 +61,6 @@ pass_filenames = false;
}; }; }; - builder = buildGoApplication { - pname = "website-builder"; - inherit version; - CGO_ENABLED = 0; - src = with lib.fileset; toSource { - root = ./.; - fileset = unions [ - ./go.mod - ./go.sum - ./cmd/build - ./internal - ./templates - ]; - }; - modules = ./nix/gomod2nix.toml; - patchPhase = '' - ${pkgs.templ}/bin/templ generate - ''; - subPackages = [ "cmd/build" ]; - }; - website = runCommandLocal "build" - { - src = with lib.fileset; toSource { - root = ./.; - fileset = unions [ - ./config.toml - ./content - ./static - ./templates - ]; - }; - } '' - cd $src - ${builder}/bin/build -s $src -d $out - cp $src/config.toml $out/ - ''; server = buildGoApplication { pname = "server"; inherit version;
@@ -122,8 +86,8 @@ "-s"
"-w" ]; }; - docker-stream = mkDockerStream { inherit server website; }; - docker-image = mkDockerImage { inherit server website; }; + docker-stream = mkDockerStream { inherit server; }; + docker-image = mkDockerImage { inherit server; }; server-amd64-linux = server.overrideAttrs (old: old // { GOOS = "linux";
@@ -137,12 +101,10 @@ fi
''; }); docker-image-amd64-linux = mkDockerImage { - inherit website; server = server-amd64-linux; architecture = "amd64"; }; docker-stream-amd64-linux = mkDockerStream { - inherit website; server = server-amd64-linux; architecture = "amd64"; };