foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-04-16 06:19:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/builders: fix Docker builder
Some checks failed
Build devcontainers / build-devcontainers (push) Has been cancelled
Details
Cache outputs / build-custom-packages (push) Has been cancelled
Details
Check flake outputs / check-outputs (push) Has been cancelled
Details
Publish every Git push to master to FlakeHub / flakehub-publish (push) Has been cancelled
Details
Build personalized bootstrap ISO / build-iso (x86_64-linux) (push) Has been cancelled
Details
Build project site / build (push) Has been cancelled
Details
Build project site / deploy (push) Has been cancelled
Details
Update flake inputs / update (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Gabriel Arazas 2025-03-17 08:12:53 +08:00
parent a13217867f
commit 0de1441342
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/builders/build-docker-image.nix
View File

@ -1,8 +1,11 @@
{ dockerTools, foodogsquaredLib }: { dockerTools, lib, foodogsquaredLib }:
{ name, contents ? [ ], pathsToLink ? [ ], enableTypicalSetup ? true, ... }@attrs: { 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}"; name = "fds-${name}";
copyToRoot = foodogsquaredLib.buildFDSEnv { copyToRoot = foodogsquaredLib.buildFDSEnv {
@ -22,10 +25,10 @@ dockerTools.buildImage (attrs // {
${lib.optionalString enableTypicalSetup '' ${lib.optionalString enableTypicalSetup ''
mkdir -p /data mkdir -p /data
''} ''}
${attrs.runAsRoot} ${attrs.runAsRoot or ""}
''; '';
config = attrs.config // lib.optionalAttrs enableTypicalSetup { config = (attrs.config or {}) // lib.optionalAttrs enableTypicalSetup {
Cmd = [ "/bin/bash" ]; Cmd = [ "/bin/bash" ];
WorkingDir = "/data"; WorkingDir = "/data";
Volumes."/data" = { }; Volumes."/data" = { };