Fix nix docker build

strykeforce · Feb 2, 2024 · 4199118 · 4199118
1 parent c288019
commit 4199118
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/web/Makefile b/web/Makefile
diff --git a/web/flake.nix b/web/flake.nix
@@ -56,12 +56,10 @@
                 }
               '';
             in
-            pkgs.dockerTools.buildLayeredImage {
-              name = "j3ff/deadeye-admin";
+            pkgs.dockerTools.buildImage {
+              name = "j3ff/deadeye-web";
               tag = "latest";
-              contents = with pkgs; [
-                bashInteractive
-                busybox
+              copyToRoot = with pkgs; [
                 nginx
               ];
 
@@ -92,7 +90,7 @@
           #
           devShells.default = pkgs.mkShell {
             # inputsFrom = [ self.packages.${system}.deadeye-admin ];
-            packages = with pkgs; [ nodejs_18 node2nix ];
+            packages = with pkgs; [ just nodejs_18 node2nix ];
           };
         });
 }
diff --git a/web/justfile b/web/justfile
@@ -0,0 +1,19 @@
+# just manual: https://github.com/casey/just#readme
+
+default:
+  @just --list
+
+IMAGE := "j3ff/deadeye-web"
+VERSION := `git rev-parse --short HEAD`
+
+docker:
+  nix build .#dockerImage
+  docker load < result
+  docker tag {{ IMAGE }}:latest {{ IMAGE }}:{{VERSION}}
+
+run: docker
+  docker run -it --rm --name deadeye-web -p 80:80 {{IMAGE}}:{{VERSION}}
+
+
+deploy: docker
+  docker push {{ IMAGE }}:{{VERSION}}