all repos — website @ a10c8466b4bf81f9ddd356a2da90e8e5e9b360a5

My website

split output directories into website/{public,private}

Alan Pearce
commit

a10c8466b4bf81f9ddd356a2da90e8e5e9b360a5

parent

bbda985b3aec721a7d972d76780ca981140f6f3c

1 file changed, 10 insertions(+), 10 deletions(-)

changed files
M nix/default.nix → nix/default.nix
@@ -2,7 +2,7 @@ { pkgs, self }:
 let
   version = self.shortRev or self.dirtyShortRev or "unstable-${self.lastModified}";
   dockerTag = self.rev or self.dirtyRev or "unstable-${self.lastModified}";
-  mkDocker = type: { server, public }:
+  mkDocker = type: { server, website }:
     let
       PORT = 3000;
     in

@@ -11,7 +11,7 @@ name = "registry.fly.io/alanpearce-eu";
       tag = dockerTag;
       contents = [
         (pkgs.writeTextDir "config.toml" (builtins.readFile ./../config.toml))
-        public
+        website
       ];
       config = {
         Cmd = [ "${server}/bin/server" ];

@@ -46,7 +46,7 @@ };
     modules = ./gomod2nix.toml;
     subPackages = [ "cmd/build" ];
   };
-  public = runCommandLocal "build"
+  website = runCommandLocal "build"
     {
       src = with lib.fileset; toSource {
         root = ./..;

@@ -58,7 +58,7 @@ ./../templates
         ];
       };
     } ''
-    ${builder}/bin/build -s $src -d $out/public
+    ${builder}/bin/build -s $src -d $out/website
   '';
   server = buildGoApplication {
     pname = "server";

@@ -76,18 +76,18 @@ };
     modules = ./gomod2nix.toml;
     ldflags = [ "-s" "-w" "-X" "main.Commit=${version}" ];
   };
-  docker-stream = mkDockerStream { inherit server public; };
+  docker-stream = mkDockerStream { inherit server website; };
   docker-stream-aarch64-linux = mkDockerStream {
-    inherit public; server = (self.packages.aarch64-linux.server);
+    inherit website; server = (self.packages.aarch64-linux.server);
   };
   docker-stream-x86_64-linux = mkDockerStream {
-    inherit public; server = (self.packages.x86_64-linux.server);
+    inherit website; server = (self.packages.x86_64-linux.server);
   };
-  docker-image = mkDockerImage { inherit server public; };
+  docker-image = mkDockerImage { inherit server website; };
   docker-image-aarch64-linux = mkDockerImage {
-    inherit public; server = (self.packages.aarch64-linux.server);
+    inherit website; server = (self.packages.aarch64-linux.server);
   };
   docker-image-x86_64-linux = mkDockerImage {
-    inherit public; server = (self.packages.x86_64-linux.server);
+    inherit website; server = (self.packages.x86_64-linux.server);
   };
 }