From fba3a24f169fb65d507ae9061dea662ade4306db Mon Sep 17 00:00:00 2001 From: soraefir Date: Sat, 9 May 2026 10:09:51 +0200 Subject: [PATCH] custom image --- modules/server/containers/builder.nix | 7 +++++-- modules/server/containers/defs/traefik.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/server/containers/builder.nix b/modules/server/containers/builder.nix index 1366740..5902e00 100644 --- a/modules/server/containers/builder.nix +++ b/modules/server/containers/builder.nix @@ -1,13 +1,16 @@ { config, lib, serverCfg }: let builder = - { image, secret ? null + { image, imageStream ? null + , secret ? null , subdomain ? null, ip ? null, port ? 0 , extraEnv ? { }, extraLabels ? { }, extraOptions ? [ ] , overrides ? { } }: let base = { - inherit image; + image = if imageStream != null then "${imageStream.imageName}:${imageStream.imageTag}" + else image; + imageStream = imageStream; environmentFiles = if secret!=null then [ config.sops.secrets."${lib.toUpper secret}".path ] else []; environment = {} // extraEnv; diff --git a/modules/server/containers/defs/traefik.nix b/modules/server/containers/defs/traefik.nix index a430612..02e2495 100644 --- a/modules/server/containers/defs/traefik.nix +++ b/modules/server/containers/defs/traefik.nix @@ -26,7 +26,7 @@ in { server = builder.mkContainer { subdomain = containerCfg.subdomain; # image = "ghcr.io/traefik/traefik:${version}"; - imageStream = image; + image = image; ip = containerCfg.ip; port = 8080; secret = name;