From cf8d27821905c11a54204f76b6df0326d6f36179 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 22 Sep 2024 21:11:51 +0200 Subject: [PATCH] Move global image versions from nixos-servers repo --- flake.nix | 1 + globals.nix | 42 ++++++++++++++++++++++++++++++++++++++++++ kubenix.nix | 4 ++-- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 globals.nix diff --git a/flake.nix b/flake.nix index 4b0444c..014d880 100644 --- a/flake.nix +++ b/flake.nix @@ -40,5 +40,6 @@ outputs = inputs@{ flutils, ... }: flutils.lib.meld inputs [ ./kubenix.nix ./scripts + ./globals.nix ]; } diff --git a/globals.nix b/globals.nix new file mode 100644 index 0000000..f00dcd1 --- /dev/null +++ b/globals.nix @@ -0,0 +1,42 @@ +{ servers, ... }: +let + globals = { + images = { + jellyfin = "jellyfin/jellyfin:10.9.9"; + deluge = "linuxserver/deluge:2.1.1"; + jellyseerr = "fallenbagel/jellyseerr:1.9.2"; + radarr = "lscr.io/linuxserver/radarr:5.9.1"; + prowlarr = "lscr.io/linuxserver/prowlarr:1.21.2"; + sonarr = "lscr.io/linuxserver/sonarr:4.0.8"; + bazarr = "lscr.io/linuxserver/bazarr:1.4.3"; + atuin = "ghcr.io/atuinsh/atuin:18.3.0"; + postgres14 = "postgres:14"; + kms = "teddysun/kms:latest"; + paperless = "ghcr.io/paperless-ngx/paperless-ngx:2.11.6"; + redis7 = "docker.io/library/redis:7"; + nextcloud = "nextcloud:29.0.5"; + postgres15 = "postgres:15"; + inbucket = "inbucket/inbucket:edge"; + syncthing = "lscr.io/linuxserver/syncthing:1.27.10"; + radicale = "tomsquest/docker-radicale:3.2.3.0"; + ntfy = "binwiederhier/ntfy:v2.11.0"; + forgejo = "codeberg.org/forgejo/forgejo:8.0.1"; + pihole = "pihole/pihole:2024.07.0"; + immich = "ghcr.io/immich-app/immich-server:v1.114.0"; + immich-machine-learning = "ghcr.io/immich-app/immich-machine-learning:v1.114.0"; + immich-redis = "docker.io/redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e"; + immich-postgres = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0"; + kitchenowl = "tombursch/kitchenowl:v0.5.2"; + cyberchef = "mpepping/cyberchef:latest"; + freshrss = "freshrss/freshrss:1.24.3"; + bind9 = "ubuntu/bind9:9.18-22.04_beta"; + dnsmasq = "dockurr/dnsmasq:2.90"; + attic = "git.kun.is/home/atticd:fd910d91c2143295e959d2c903e9ea25cf94ba27"; + hedgedoc = "quay.io/hedgedoc/hedgedoc:1.9.9"; + minecraft = "itzg/minecraft-server:latest"; + }; + }; +in +{ + globals = globals // servers.globals; +} diff --git a/kubenix.nix b/kubenix.nix index 7b3a8bb..b2fe93f 100644 --- a/kubenix.nix +++ b/kubenix.nix @@ -1,4 +1,4 @@ -inputs@{ servers, flutils, nixpkgs, kubenix, ... }: flutils.lib.eachDefaultSystem +inputs@{ self, servers, flutils, nixpkgs, kubenix, ... }: flutils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -11,8 +11,8 @@ inputs@{ servers, flutils, nixpkgs, kubenix, ... }: flutils.lib.eachDefaultSyste mkKubernetes = name: module: namespace: (kubenix.evalModules.${system} { specialArgs = { inherit namespace system machines; - inherit (servers) globals; inherit (inputs) nixhelm blog-pim dns; + inherit (self) globals; }; module = { kubenix, ... }: