From bba420386faf54be6fac3a0009856ec10bc0f610 Mon Sep 17 00:00:00 2001 From: C4illin Date: Thu, 15 May 2025 22:11:30 +0200 Subject: [PATCH] chore: flake wip --- flake.nix | 86 +++++++++++++++++++++++++--------------------------- package.json | 3 +- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/flake.nix b/flake.nix index 1b91bad..79e1e72 100644 --- a/flake.nix +++ b/flake.nix @@ -8,55 +8,53 @@ outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { inherit system; }; - appSrc = ./.; + let pkgs = import nixpkgs { inherit system; }; + appSrc = ./.; - app = pkgs.dockerTools.buildLayeredImage { - name = "convertx"; - tag = "latest"; + app = pkgs.dockerTools.buildLayeredImage { + name = "convertx"; + tag = "latest"; - contents = [ - pkgs.bun - pkgs.resvg - pkgs.ffmpeg - pkgs.graphicsmagick - pkgs.ghostscript - pkgs.vips - pkgs.pandoc - pkgs.texlive.combined.scheme-full - pkgs.calibre - pkgs.inkscape - pkgs.poppler_utils - pkgs.assimp - pkgs.jxrlib - pkgs.libheif - pkgs.libjxl - pkgs.python3Packages.numpy + contents = [ + pkgs.bun + pkgs.resvg + pkgs.ffmpeg + pkgs.graphicsmagick + pkgs.ghostscript + pkgs.vips + pkgs.pandoc + pkgs.texlive.combined.scheme-full + pkgs.calibre + pkgs.inkscape + pkgs.poppler_utils + pkgs.assimp + pkgs.jxrlib + pkgs.libheif + pkgs.libjxl + pkgs.python3Packages.numpy + ]; + + config = { + Env = [ + "NODE_ENV=production" + "PATH=/bin:/usr/bin" ]; - - config = { - Env = [ - "NODE_ENV=production" - "PATH=/bin:/usr/bin" - ]; - WorkingDir = "/app"; - Cmd = [ "bun" "run" "./src/index.tsx" ]; - ExposedPorts = { - "3000/tcp" = {}; - }; + WorkingDir = "/app"; + Cmd = [ "bun" "run" "./src/index.tsx" ]; + ExposedPorts = { + "3000/tcp" = {}; }; - - extraCommands = '' - export PATH=${pkgs.bun}/bin:$PATH - mkdir -p app - cp -r ${appSrc}/* app/ - cd app - bun install --frozen-lockfile --production - bun run build - ''; }; + + extraCommands = '' + export PATH=${pkgs.bun}/bin:$PATH + mkdir -p /app + cp -r ${./dist}/* /app/ + ''; + }; + in { packages.default = app; - }); + } + ); } diff --git a/package.json b/package.json index 24c6102..b9f4740 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "scripts": { "dev": "bun run --watch src/index.tsx", "hot": "bun run --hot src/index.tsx", + "start": "bun run src/index.tsx", "format": "eslint --fix .", "build": "bunx @tailwindcss/cli -i ./src/main.css -o ./public/generated.css", "lint": "run-p 'lint:*'", @@ -51,4 +52,4 @@ "typescript": "^5.8.3", "typescript-eslint": "^8.32.0" } -} \ No newline at end of file +}