Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
mtgmonkey 2025-06-10 07:06:37 -04:00
parent fbe76946dc
commit 98d0188530
3 changed files with 71 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

147
flake.nix
View file

@ -23,86 +23,11 @@
cp . $out/src
'';
};
port = 8920;
source = "${pkgs.callPackage pkg}/src";
module = {
lib,
config,
...
}: {
virtualisation.docker = {
enable = true;
autoPrune.enable = true;
};
virtualisation.oci-containers.backend = "docker";
virtualisation.oci-containers.containers."jank-client-jank" = {
image = "compose2nix/jank-client-jank";
ports = [
"${port}:8080/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=jank"
"--network=jank-client_default"
];
};
systemd.services."docker-jank-client-jank" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9;
};
after = [
"docker-network-jank-client_default.service"
];
requires = [
"docker-network-jank-client_default.service"
];
partOf = [
"docker-compose-jank-client-root.target"
];
wantedBy = [
"docker-compose-jank-client-root.target"
];
};
systemd.services."docker-network-jank-client_default" = {
path = [pkgs.docker];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStop = "docker network rm -f jank-client_default";
};
script = ''
docker network inspect jank-client_default || docker network create jank-client_default
'';
partOf = ["docker-compose-jank-client-root.target"];
wantedBy = ["docker-compose-jank-client-root.target"];
};
systemd.services."docker-build-jank-client-jank" = {
path = [pkgs.docker pkgs.git];
serviceConfig = {
Type = "oneshot";
TimeoutSec = 300;
};
script = ''
cd ${source}
docker build -t compose2nix/jank-client-jank .
'';
};
systemd.targets."docker-compose-jank-client-root" = {
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = ["multi-user.target"];
};
};
in {
packages.${system}.default = pkg;
nixosModules.${system}.default = {
lib,
config,
module,
...
}: {
options = {
@ -113,6 +38,11 @@
default = pkgs.callPackage pkg;
type = lib.types.package;
};
port = lib.mkOption {
description = "port to bind to";
default = 8080;
type = lib.types.int;
};
};
};
config = lib.mkIf config.services.jank-client.enable {
@ -120,7 +50,72 @@
(lib.getExe
config.services.jank-client.package)
];
inherit module;
virtualisation.docker = {
enable = true;
autoPrune.enable = true;
};
virtualisation.oci-containers.backend = "docker";
virtualisation.oci-containers.containers."jank-client-jank" = {
image = "compose2nix/jank-client-jank";
ports = [
"${config.services.jank-client.port}:8080/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=jank"
"--network=jank-client_default"
];
};
systemd.services."docker-jank-client-jank" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
RestartMaxDelaySec = lib.mkOverride 90 "1m";
RestartSec = lib.mkOverride 90 "100ms";
RestartSteps = lib.mkOverride 90 9;
};
after = [
"docker-network-jank-client_default.service"
];
requires = [
"docker-network-jank-client_default.service"
];
partOf = [
"docker-compose-jank-client-root.target"
];
wantedBy = [
"docker-compose-jank-client-root.target"
];
};
systemd.services."docker-network-jank-client_default" = {
path = [pkgs.docker];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStop = "docker network rm -f jank-client_default";
};
script = ''
docker network inspect jank-client_default || docker network create jank-client_default
'';
partOf = ["docker-compose-jank-client-root.target"];
wantedBy = ["docker-compose-jank-client-root.target"];
};
systemd.services."docker-build-jank-client-jank" = {
path = [pkgs.docker pkgs.git];
serviceConfig = {
Type = "oneshot";
TimeoutSec = 300;
};
script = ''
cd ${config.services.jank-client.package}/src
docker build -t compose2nix/jank-client-jank .
'';
};
systemd.targets."docker-compose-jank-client-root" = {
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = ["multi-user.target"];
};
};
};
};