From a7b927329672257a0ef559979f8df0b7db9e955d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 16 Sep 2026 22:02:04 -0400 Subject: [PATCH] new static ip and merge approach --- hosts/hl-minipc2.nix | 23 +++++++++++------- .../containers/container-services/ABOUTME.md | 9 ++++--- .../containers/container-services/compose.nix | 18 ++++++++++++++ .../containers/container-services/default.nix | 20 +++++++++++---- .../containers/container-services/options.nix | 20 +++++++++------ .../containers/container-services/systemd.nix | 23 +++++++++++++----- modules/nixos/common/containers/user-guide.md | 22 +++++++++++++---- secrets/stack1.age | Bin 928 -> 977 bytes secrets/stack2.age | Bin 1877 -> 1926 bytes 9 files changed, 99 insertions(+), 36 deletions(-) diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 63ff156..25ef84c 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -17,6 +17,11 @@ let }; }; }; + staticIp = ip: { + lan = { + ipv4_address = ip; + }; + }; in { skyg.user.enable = true; @@ -76,11 +81,7 @@ in environment = { PORT = "80"; }; - networks = { - lan = { - ipv4_address = "10.0.101.2"; - }; - }; + networks = staticIp "10.0.101.2"; }; networks = macvlanNetwork; }; @@ -95,16 +96,18 @@ in "/var/run/docker.sock:/var/run/docker.sock" "portainer_data:/data" ]; - ports = [ - "9443:9443" - "8000:8000" - ]; + # ports = [ + # "9443:9443" + # "8000:8000" + # ]; + networks = staticIp "10.0.101.5"; }; volumes = { portainer_data = { name = "portainer_data"; }; }; + networks = macvlanNetwork; }; age.secrets.stack1.file = ../secrets/stack1.age; @@ -112,12 +115,14 @@ in enable = true; autoUpdate.enable = true; composeFile = config.age.secrets.stack1.path; + networks = macvlanNetwork; }; age.secrets.stack2.file = ../secrets/stack2.age; skyg.nixos.common.container-services.stack2 = { enable = true; autoUpdate.enable = true; composeFile = config.age.secrets.stack2.path; + networks = macvlanNetwork; }; # Scrypted backup timer (image auto-update handled by container-services autoUpdate) diff --git a/modules/nixos/common/containers/container-services/ABOUTME.md b/modules/nixos/common/containers/container-services/ABOUTME.md index af7f39c..feca318 100644 --- a/modules/nixos/common/containers/container-services/ABOUTME.md +++ b/modules/nixos/common/containers/container-services/ABOUTME.md @@ -9,7 +9,7 @@ Custom compose-style container service groups for systemd. | `default.nix` | Main module entry point; imports options and wires everything | | `options.nix` | All `skyg.nixos.common.container-services.*` option declarations | | `lib.nix` | Shared helpers (runtime dispatch, path sanitization, env file collection) | -| `compose.nix` | YAML composition (mkComposeService, mkComposeAttrs, mkComposeFile) | +| `compose.nix` | YAML composition (mkComposeService, mkComposeAttrs, mkComposeFile, mkOverridesFile) | | `files.nix` | File mounting logic (getAllFiles, mkFileVolumesForService, mkFilesService) | | `systemd.nix` | Systemd unit builders (mkSystemdService, mkPathUnit, mkEnvReloadService) | @@ -24,8 +24,11 @@ Custom compose-style container service groups for systemd. 7. `default.nix` wires tmpfiles, services, and paths together A group may instead set `composeFile` (e.g. to an agenix secret path) to use an -external, ready-made compose file verbatim instead of rendering from options — -useful for keeping sensitive definitions (NFS, env) out of version control. +external, ready-made compose file for `services` instead of rendering from +options — useful for keeping sensitive definitions (NFS, env) out of version +control. `networks`/`volumes`/`extraConfig` set alongside `composeFile` still +apply: they're rendered as a base overrides file merged in via an earlier +compose `-f` flag, with `composeFile` itself taking precedence on overlaps. See `user-guide.md` → "Secret Compose Definitions". ## Adding a new feature diff --git a/modules/nixos/common/containers/container-services/compose.nix b/modules/nixos/common/containers/container-services/compose.nix index f16c0f1..e539238 100644 --- a/modules/nixos/common/containers/container-services/compose.nix +++ b/modules/nixos/common/containers/container-services/compose.nix @@ -77,4 +77,22 @@ rec { mkComposeFile = pkgs: groupName: grpCfg: fileVolumesByService: (pkgs.formats.yaml { }).generate "compose.yml" (mkComposeAttrs groupName grpCfg fileVolumesByService); + + # Build the overrides attrset (networks/volumes/extraConfig only) used + # alongside an external composeFile. Passed as an earlier -f file so the + # composeFile's own definitions win on any overlapping keys. + mkOverridesAttrs = grpCfg: + lib.optionalAttrs (grpCfg.networks != { }) + { + networks = grpCfg.networks; + } + // lib.optionalAttrs (grpCfg.volumes != { }) { + volumes = grpCfg.volumes; + } + // grpCfg.extraConfig; + + # Render the overrides file to the Nix store. + mkOverridesFile = pkgs: groupName: grpCfg: + (pkgs.formats.yaml { }).generate "compose-overrides-${groupName}.yml" + (mkOverridesAttrs grpCfg); } diff --git a/modules/nixos/common/containers/container-services/default.nix b/modules/nixos/common/containers/container-services/default.nix index 91dd447..b07bb36 100644 --- a/modules/nixos/common/containers/container-services/default.nix +++ b/modules/nixos/common/containers/container-services/default.nix @@ -18,6 +18,15 @@ let autoUpdateGroups = lib.filterAttrs (_: g: g.autoUpdate.enable) enabledGroups; optionsModule = import ./options.nix { inherit lib; }; + # When composeFile is set, networks/volumes/extraConfig declared alongside it + # are rendered as a base overrides file merged in via an earlier -f flag, so + # the composeFile's own definitions win on any overlapping keys. + mkOverridesFileFor = groupName: grpCfg: + if grpCfg.composeFile != null + && (grpCfg.networks != { } || grpCfg.volumes != { } || grpCfg.extraConfig != { }) + then composeLib.mkOverridesFile pkgs groupName grpCfg + else null; + in { options = optionsModule.options; @@ -62,17 +71,18 @@ in (groupName: grpCfg: let fileVolumes = filesLib.mkFileVolumesForGroup groupName grpCfg; - # An external compose file (e.g. an agenix secret) is used verbatim; - # otherwise render one from the group's options. + # An external compose file (e.g. an agenix secret) is used for + # services; otherwise render one from the group's options. effectiveComposeFile = if grpCfg.composeFile != null then grpCfg.composeFile else composeLib.mkComposeFile pkgs groupName grpCfg fileVolumes; + overridesFile = mkOverridesFileFor groupName grpCfg; hasFiles = grpCfg.composeFile == null && filesLib.getAllFiles grpCfg != { }; in lib.nameValuePair "container-services-${groupName}" - (systemdLib.mkSystemdService groupName grpCfg effectiveComposeFile composeBin runtimeService hasFiles)) + (systemdLib.mkSystemdService groupName grpCfg effectiveComposeFile overridesFile composeBin runtimeService hasFiles)) enabledGroups // lib.foldAttrs lib.recursiveUpdate { } ( lib.mapAttrsToList @@ -92,7 +102,7 @@ in ) // lib.mapAttrs' (groupName: grpCfg: - let units = systemdLib.mkUpdateUnits groupName grpCfg composeBin runtimeBin; + let units = systemdLib.mkUpdateUnits groupName grpCfg (mkOverridesFileFor groupName grpCfg) composeBin runtimeBin; in lib.nameValuePair "container-services-${groupName}-update" units.services."container-services-${groupName}-update") autoUpdateGroups; @@ -109,7 +119,7 @@ in systemd.timers = lib.mapAttrs' (groupName: grpCfg: - let units = systemdLib.mkUpdateUnits groupName grpCfg composeBin runtimeBin; + let units = systemdLib.mkUpdateUnits groupName grpCfg (mkOverridesFileFor groupName grpCfg) composeBin runtimeBin; in lib.nameValuePair "container-services-${groupName}-update" units.timers."container-services-${groupName}-update") autoUpdateGroups; }; diff --git a/modules/nixos/common/containers/container-services/options.nix b/modules/nixos/common/containers/container-services/options.nix index e01b96d..c34da96 100644 --- a/modules/nixos/common/containers/container-services/options.nix +++ b/modules/nixos/common/containers/container-services/options.nix @@ -36,15 +36,19 @@ example = "config.age.secrets.my-compose.path"; description = '' Optional path to a ready-made compose file (e.g. an agenix-decrypted - secret such as config.age.secrets.my-compose.path) to use verbatim as - the group's compose.yml, instead of rendering one from - services/volumes/networks. + secret such as config.age.secrets.my-compose.path) to use as the + group's compose.yml, instead of rendering one from services. - When set, this group's services/volumes/networks/files blocks are - ignored; the external file must be a complete compose document. Use - this to keep a full definition (NFS devices, images, env, etc.) out - of version control while still deploying it through - container-services. + When set, this group's services/files blocks are ignored; the + external file must define services itself. However, networks/ + volumes/extraConfig set alongside composeFile ARE used: they're + rendered into a base overrides file passed to compose via an + earlier -f flag, so the composeFile is merged in as an override on + top (compose's native multi-file merge — composeFile's own + definitions win on any overlapping keys). Use this to keep a full + service definition (NFS devices, images, env, etc.) out of version + control while still deploying it through container-services, with + shared/host-specific networks or volumes still declared in Nix. ''; }; diff --git a/modules/nixos/common/containers/container-services/systemd.nix b/modules/nixos/common/containers/container-services/systemd.nix index 71a22e3..94a1a0d 100644 --- a/modules/nixos/common/containers/container-services/systemd.nix +++ b/modules/nixos/common/containers/container-services/systemd.nix @@ -2,10 +2,14 @@ { # Create a systemd oneshot service that manages the compose stack. - mkSystemdService = groupName: grpCfg: composeFile: composeBin: runtimeService: hasFiles: + mkSystemdService = groupName: grpCfg: composeFile: overridesFile: composeBin: runtimeService: hasFiles: let stateDir = grpCfg.stateDir; fileServiceDep = if hasFiles then "container-services-${groupName}-files.service" else null; + composeFileArgs = + if overridesFile != null + then "-f ${stateDir}/compose.overrides.yml -f ${stateDir}/compose.yml" + else "-f ${stateDir}/compose.yml"; in { description = "Container service group '${groupName}'"; @@ -29,19 +33,26 @@ Type = "oneshot"; RemainAfterExit = true; TimeoutStopSec = grpCfg.timeoutStopSec; - ExecStartPre = "${pkgs.coreutils}/bin/cp ${composeFile} ${stateDir}/compose.yml"; - ExecStart = "${composeBin} -p ${groupName} -f ${stateDir}/compose.yml up -d --remove-orphans"; - ExecStop = "${composeBin} -p ${groupName} -f ${stateDir}/compose.yml down"; + ExecStartPre = + [ "${pkgs.coreutils}/bin/cp ${composeFile} ${stateDir}/compose.yml" ] + ++ lib.optional (overridesFile != null) + "${pkgs.coreutils}/bin/cp ${overridesFile} ${stateDir}/compose.overrides.yml"; + ExecStart = "${composeBin} -p ${groupName} ${composeFileArgs} up -d --remove-orphans"; + ExecStop = "${composeBin} -p ${groupName} ${composeFileArgs} down"; }; }; # Create the update service + timer for a group's autoUpdate config. - mkUpdateUnits = groupName: grpCfg: composeBin: runtimeBin: + mkUpdateUnits = groupName: grpCfg: overridesFile: composeBin: runtimeBin: let auCfg = grpCfg.autoUpdate; stateDir = grpCfg.stateDir; unitName = "container-services-${groupName}-update"; - composeCmd = "${composeBin} -p ${groupName} -f ${stateDir}/compose.yml"; + composeFileArgs = + if overridesFile != null + then "-f ${stateDir}/compose.overrides.yml -f ${stateDir}/compose.yml" + else "-f ${stateDir}/compose.yml"; + composeCmd = "${composeBin} -p ${groupName} ${composeFileArgs}"; in { services."${unitName}" = { diff --git a/modules/nixos/common/containers/user-guide.md b/modules/nixos/common/containers/user-guide.md index e8c7c85..6cb6afb 100644 --- a/modules/nixos/common/containers/user-guide.md +++ b/modules/nixos/common/containers/user-guide.md @@ -8,6 +8,7 @@ staged on disk, and managed by a systemd oneshot unit. | What | Path | | ---- | ---- | | Staged compose file | `/var/lib/container-services//compose.yml` | +| Staged overrides file (composeFile groups with networks/volumes/extraConfig set) | `/var/lib/container-services//compose.overrides.yml` | | Nix store source | `/nix/store/…-compose.yml` (copied on each activation) | | Systemd unit | `container-services-.service` | | Container logs | `docker compose -p logs -f ` | @@ -142,15 +143,26 @@ age.secrets.my-stack = { skyg.nixos.common.container-services.my-stack = { enable = true; composeFile = config.age.secrets.my-stack.path; + # Optional: merged in as a base layer, overridden by composeFile itself + # on any overlapping keys. + networks = { + lan = { + driver = "macvlan"; + driver_opts.parent = "enp2s0"; + }; + }; }; ``` When `composeFile` is set, the module: -- Uses that file **verbatim** as the group's `compose.yml` (copied to - `/var/lib/container-services//compose.yml` at startup, just like a - rendered one). -- Ignores this group's `services`/`volumes`/`networks`/`files` blocks — the - external file must be a complete compose document. +- Copies that file to `/var/lib/container-services//compose.yml` at + startup, just like a rendered one. It must define `services` itself — + ignores this group's `services`/`files` blocks. +- If this group also sets `networks`/`volumes`/`extraConfig`, those are + rendered to `/var/lib/container-services//compose.overrides.yml` and + passed to compose **before** the composeFile (`-f compose.overrides.yml -f + compose.yml`), so compose's native multi-file merge applies — + composeFile's own definitions win on any overlapping keys. - Requires exactly one of `composeFile` or `services` to be set (assertion). Notes: diff --git a/secrets/stack1.age b/secrets/stack1.age index 235a7d937054dfc0d3c7a56c465a237e20f1d263..0ebe7091b3452103cd3e1af4d9c360d34a07883b 100644 GIT binary patch delta 947 zcmV;k15Es&2hj(REPr8hQ$bX8VKX**ZbeW*bZIkdSyoU;Ni=I^b8kNc{X-cW;ir3T6Q@rNPlNpL^LoqS7SkIby{&` zc~wwHRWfcvQ&>`O3NtoOH&;fUzaaL|Y*S8ZMOaXBIZ|?SdS_Bba5QjcPB40F z3QFVAU=$y|B!33SCneCCC#{(&&ZEmec9Wp4N{w#6FMk z^1>o*it;44XT;EoBE=1Rhf+FJ1ul1;V`6*$#}of6zCY1N;=9IbtKwS>O^brS(}bqX z?_A+DnO{Fr{cgi9;$`)oaW!oXYp@sh=I-KQxw+p`Vt;)OMInHO9i;@@94Sfb0$}TN zr_YO1HiFy^0z);74sL^w#^(Tztk*{$F%EjtZIJ?q(cUNG?A24R)V>BE+w!%UfIx$!it>X3}Vp21!;uF3r1 z@v|Q!&wn#x6nkoS_>Fn9)(_uH}TdaMn=AACNFb#KHpUA=X9cRR5`3X@8onql$kX( zbv>hQkXAr++~HW+dA8|KyYvs&VWBHm>aMXW^MB4~FMImrc=1cA5SzTs6IezA$uYTL zRLj!g0@`}?A7M`wr0+pDZ!y13wFV0UPNaA|1^tDzmD!Ye8_#kcdrx1SOa;i(aJNZ) zEyDLNQ<#FcuJ8T6X=M_AL1<&+OcF{WQ&x)SECVO3dPmz&!UlQXKK2>Zoq$(q*!Q1N zcz^A3uyu|6b}FYE2MAhh(OrFpxllVn;K6tvQ>A&{t?MHkaNPPv(0iZ}mcLR4+?rW( zBQ_@v>!xCz!oC1Cv}L5>p?~_DQNF09YDHA7RdQxDVH(UM#tZsB^+!#Act1XjJ*Y^i z7}MLv`IARF=UpX78>4tJr<`Vu|P V#t9{aSZ$QxeSB%>Aq%0+RM#jZuonOT delta 897 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