From 0de1441342212da3755339ab67820ada0d176725 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 17 Mar 2025 08:12:53 +0800
Subject: [PATCH] lib/builders: fix Docker builder

---
 lib/builders/build-docker-image.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/builders/build-docker-image.nix b/lib/builders/build-docker-image.nix
index fa454bc8..ee2406a1 100644
--- a/lib/builders/build-docker-image.nix
+++ b/lib/builders/build-docker-image.nix
@@ -1,8 +1,11 @@
-{ dockerTools, foodogsquaredLib }:
+{ dockerTools, lib, foodogsquaredLib }:
 
 { name, contents ? [ ], pathsToLink ? [ ], enableTypicalSetup ? true, ... }@attrs:
 
-dockerTools.buildImage (attrs // {
+let
+  attrs' = lib.removeAttrs attrs [ "contents" "pathsToLink" "enableTypicalSetup" "name" ];
+in
+dockerTools.buildImage (attrs' // {
   name = "fds-${name}";
 
   copyToRoot = foodogsquaredLib.buildFDSEnv {
@@ -22,10 +25,10 @@ dockerTools.buildImage (attrs // {
     ${lib.optionalString enableTypicalSetup ''
       mkdir -p /data
     ''}
-    ${attrs.runAsRoot}
+    ${attrs.runAsRoot or ""}
   '';
 
-  config = attrs.config // lib.optionalAttrs enableTypicalSetup {
+  config = (attrs.config or {}) // lib.optionalAttrs enableTypicalSetup {
     Cmd = [ "/bin/bash" ];
     WorkingDir = "/data";
     Volumes."/data" = { };