sora/nixconfig
1
0
Fork 1
Code Issues 2 Pull Requests Actions Releases Activity

change podman building

Browse Source
This commit is contained in:
soraefir
2026-05-06 22:59:11 +02:00
parent c457867440
commit 1c0cfd1afe
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/server/containers/default.nix
View File

@@ -3,8 +3,11 @@ let
cfg = config.syscfg.server.containers; cfg = config.syscfg.server.containers;
enabledConfigs = lib.filterAttrs (name: c: c.enable) cfg; enabledConfigs = lib.filterAttrs (name: c: c.enable) cfg;
containerSetsList = lib.mapAttrsToList (name: containerCfg: containerSetsList = lib.mapAttrsToList (name: containerCfg:
import (./defs + "/${name}.nix") { let defs = import (./defs + "/${name}.nix") {inherit config pkgs lib containerCfg;};
inherit config pkgs lib containerCfg; in{
containers = lib.mapAttrs' (cName: cValue:
lib.nameValuePair "${name}-${cName}" cValue
) defs.containers;
} }
) enabledConfigs; ) enabledConfigs;
mergedContainers = lib.attrsets.mergeAttrsList (lib.map(e: e.containers) containerSetsList); mergedContainers = lib.attrsets.mergeAttrsList (lib.map(e: e.containers) containerSetsList);

10
modules/server/containers/defs/authentik.nix
View File

@@ -14,9 +14,8 @@ in {
containers = { containers = {
auth_server = { server = {
image = "ghcr.io/goauthentik/server:latest"; image = "ghcr.io/goauthentik/server:latest";
hostname = "auth_server";
volumes = [ volumes = [
"${serverCfg.dataPath}/authentik/media:/media" "${serverCfg.dataPath}/authentik/media:/media"
"${serverCfg.dataPath}/authentik/templates:/templates" "${serverCfg.dataPath}/authentik/templates:/templates"
@@ -47,8 +46,6 @@ in {
cmd = [ "server" ]; cmd = [ "server" ];
extraOptions = [ extraOptions = [
"--add-host=host.containers.internal:host-gateway" "--add-host=host.containers.internal:host-gateway"
"--replace"
"--rm"
"--ip=${containerCfg.ip}" "--ip=${containerCfg.ip}"
]; ];
ports = [ ports = [
@@ -56,9 +53,8 @@ in {
]; ];
}; };
auth_worker = { worker = {
image = "ghcr.io/goauthentik/server:latest"; image = "ghcr.io/goauthentik/server:latest";
hostname = "auth_worker";
volumes = [ volumes = [
"${serverCfg.dataPath}/authentik/media:/media" "${serverCfg.dataPath}/authentik/media:/media"
"${serverCfg.dataPath}/authentik/templates:/templates" "${serverCfg.dataPath}/authentik/templates:/templates"
@@ -75,8 +71,6 @@ in {
}; };
extraOptions = [ extraOptions = [
"--add-host=host.containers.internal:host-gateway" "--add-host=host.containers.internal:host-gateway"
"--replace"
"--rm"
]; ];
cmd = [ "worker" ]; cmd = [ "worker" ];
}; };