TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 17:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lower memory requirement for test-vm

Browse Source
This commit is contained in:
eikek 2024-03-10 20:49:56 +01:00
parent 7c123db1a3
commit 3d93439b28
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1710025500, "lastModified": 1710099997,
"narHash": "sha256-niJf4WZ4GHQ+RaP+Qj4+6P/2SWN1Z4co36/ETvIg0Qg=", "narHash": "sha256-WmBKTLdth6I/D+0//9enbIXohGsBjepbjIAm9pCYj0U=",
"owner": "eikek", "owner": "eikek",
"repo": "devshell-tools", "repo": "devshell-tools",
"rev": "57d7d292571e291fe8213a1655529f739cfa174d", "rev": "e82faf976d318b3829f6f7f6785db6f3c7b65267",
"type": "github" "type": "github"
}, },
"original": { "original": {

26
flake.nix
View File

@ -15,7 +15,7 @@
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
sbt17 = pkgs.sbt.override { jre = pkgs.jdk17; }; sbt17 = pkgs.sbt.override {jre = pkgs.jdk17;};
ciPkgs = with pkgs; [ ciPkgs = with pkgs; [
sbt17 sbt17
jdk17 jdk17
@ -28,14 +28,16 @@
redocly-cli redocly-cli
tailwindcss tailwindcss
]; ];
devshellPkgs = ciPkgs ++ (with pkgs; [ devshellPkgs =
jq ciPkgs
scala-cli ++ (with pkgs; [
netcat jq
wget scala-cli
which netcat
inotifyTools wget
]); which
inotifyTools
]);
docspellPkgs = pkgs.callPackage (import ./nix/pkg.nix) {}; docspellPkgs = pkgs.callPackage (import ./nix/pkg.nix) {};
dockerAmd64 = pkgs.pkgsCross.gnu64.callPackage (import ./nix/docker.nix) { dockerAmd64 = pkgs.pkgsCross.gnu64.callPackage (import ./nix/docker.nix) {
inherit (docspellPkgs) docspell-restserver docspell-joex; inherit (docspellPkgs) docspell-restserver docspell-joex;
@ -161,6 +163,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ {
networking.hostName = "dev-vm";
virtualisation.memorySize = 2048;
services.dev-postgres = { services.dev-postgres = {
enable = true; enable = true;
databases = ["docspell"]; databases = ["docspell"];
@ -170,8 +175,8 @@
services.dev-solr = { services.dev-solr = {
enable = true; enable = true;
cores = ["docspell"]; cores = ["docspell"];
heap = 512;
}; };
port-forward.ssh = 10022; port-forward.ssh = 10022;
port-forward.dev-postgres = 6534; port-forward.dev-postgres = 6534;
port-forward.dev-smtp = 10025; port-forward.dev-smtp = 10025;
@ -180,7 +185,6 @@
port-forward.dev-minio-api = 9000; port-forward.dev-minio-api = 9000;
port-forward.dev-minio-console = 9001; port-forward.dev-minio-console = 9001;
port-forward.dev-solr = 8983; port-forward.dev-solr = 8983;
networking.hostName = "dev-vm";
} }
]; ];
}; };

4
nix/test-vm.nix
View File

@ -22,6 +22,7 @@ in {
services.dev-solr = { services.dev-solr = {
enable = true; enable = true;
cores = ["docspell"]; cores = ["docspell"];
heap = 512;
}; };
port-forward.dev-webmail = 8080; port-forward.dev-webmail = 8080;
@ -39,7 +40,8 @@ in {
firewall.allowedTCPPorts = [7880]; firewall.allowedTCPPorts = [7880];
}; };
virtualisation.memorySize = 6144; virtualisation.memorySize = 2048;
virtualisation.cores = 2;
virtualisation.forwardPorts = [ virtualisation.forwardPorts = [
{ {