diff --git a/modules/containers/docker/juicefs.nix b/modules/containers/docker/juicefs.nix index 09077bc..73e656d 100644 --- a/modules/containers/docker/juicefs.nix +++ b/modules/containers/docker/juicefs.nix @@ -38,6 +38,7 @@ ]; }; systemd.services."docker-myjfs-mount-service" = { + path = [ pkgs.util-linux ]; serviceConfig = { EnvironmentFile = "/etc/nixos/secrets/juicefs.env"; Restart = lib.mkOverride 90 "always"; @@ -53,6 +54,11 @@ "docker-network-juice_default.service" "docker-volume-juice_juicefs_cache.service" ]; + postStart = '' + while ! mountpoint -q /mnt/myjfs; do + sleep 1 + done + ''; partOf = [ "docker-compose-juice-root.target" ]; diff --git a/modules/containers/docker/karakeep/docker-compose.nix b/modules/containers/docker/karakeep/docker-compose.nix index 37fed04..9953676 100644 --- a/modules/containers/docker/karakeep/docker-compose.nix +++ b/modules/containers/docker/karakeep/docker-compose.nix @@ -124,9 +124,11 @@ }; after = [ "docker-network-karakeep_default.service" + "docker-myjfs-mount-service.service" ]; requires = [ "docker-network-karakeep_default.service" + "docker-myjfs-mount-service.service" ]; partOf = [ "docker-compose-karakeep-root.target"