From f08d7ac1d28fd9087ee61e63e7e85044a98bd945 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 21 Dec 2025 22:57:28 -0500 Subject: [PATCH] add hostnames, remove refs --- hydra/jobsets.nix | 32 ++++++++++++++-------------- systems/palatine-hill/docker/arr.nix | 8 +++++++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/hydra/jobsets.nix b/hydra/jobsets.nix index ed8f883..bfa4c52 100644 --- a/hydra/jobsets.nix +++ b/hydra/jobsets.nix @@ -18,7 +18,7 @@ let }; prs = readJSONFile pulls; - refs = readJSONFile branches; + #refs = readJSONFile branches; # template for creating a job makeJob = @@ -47,19 +47,19 @@ let giteaHost = "ssh://gitea@nayeonie.com:2222"; repo = "ahuston-0/nix-dotfiles"; # # Create a hydra job for a branch - jobOfRef = - name: - { ref, ... }: - if ((builtins.match "^refs/heads/(.*)$" ref) == null) then - null - else - { - name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}"; - value = makeJob { - description = "Branch ${name}"; - flake = "git+${giteaHost}/${repo}?ref=${ref}"; - }; - }; + #jobOfRef = + # name: + # { ref, ... }: + # if ((builtins.match "^refs/heads/(.*)$" ref) == null) then + # null + # else + # { + # name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}"; + # value = makeJob { + # description = "Branch ${name}"; + # flake = "git+${giteaHost}/${repo}?ref=${ref}"; + # }; + # }; # Create a hydra job for a PR jobOfPR = id: info: { @@ -77,12 +77,12 @@ let # wrapper function for reading json from file readJSONFile = f: builtins.fromJSON (builtins.readFile f); # remove null values from a set, in-case of branches that don't exist - mapFilter = f: l: builtins.filter (x: (x != null)) (map f l); + #mapFilter = f: l: builtins.filter (x: (x != null)) (map f l); # Create job set from PRs and branches jobs = makeSpec ( builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs)) - // builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs)) + #// builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs)) ); in { diff --git a/systems/palatine-hill/docker/arr.nix b/systems/palatine-hill/docker/arr.nix index 3fb12c7..2f087eb 100644 --- a/systems/palatine-hill/docker/arr.nix +++ b/systems/palatine-hill/docker/arr.nix @@ -50,6 +50,7 @@ in bazarr = { image = "ghcr.io/linuxserver/bazarr:latest"; ports = [ "6767:6767" ]; + hostname = "bazarr"; environment = { PUID = "600"; PGID = "100"; @@ -72,6 +73,7 @@ in prowlarr = { image = "ghcr.io/linuxserver/prowlarr:latest"; ports = [ "9696:9696" ]; + hostname = "prowlarr"; environment = { PUID = "600"; PGID = "100"; @@ -85,6 +87,7 @@ in radarr = { image = "ghcr.io/linuxserver/radarr:latest"; ports = [ "7878:7878" ]; + hostname = "radarr"; environment = { PUID = "600"; PGID = "100"; @@ -101,6 +104,7 @@ in sonarr = { image = "ghcr.io/linuxserver/sonarr:latest"; ports = [ "8989:8989" ]; + hostname = "sonarr"; environment = { PUID = "600"; PGID = "100"; @@ -117,6 +121,7 @@ in lidarr = { image = "ghcr.io/linuxserver/lidarr:latest"; ports = [ "8686:8686" ]; + hostname = "lidarr"; environment = { PUID = "600"; PGID = "100"; @@ -133,6 +138,7 @@ in unpackerr = { image = "golift/unpackerr:latest"; user = "600:100"; + hostname = "unpackerr"; environment = { TZ = "America/New_York"; }; @@ -147,6 +153,7 @@ in image = "golift/notifiarr:latest"; ports = [ "5454:5454" ]; user = "600:100"; + hostname = "notifiarr"; environment = { TZ = "America/New_York"; } @@ -161,6 +168,7 @@ in }; jellyseerr = { image = "fallenbagel/jellyseerr:latest"; + hostname = "jellyseerr"; environment = { PUID = "600"; PGID = "100"; -- 2.51.2