feat(stacks): optional STACKS_DIR layout with Hawser display paths (#1482)

When STACKS_DIR is set, local managed stacks are stored in a flat
$STACKS_DIR/<stackName>/ layout instead of $DATA_DIR/stacks/<env>/<stack>/.
Existing stacks are not moved automatically and continue to resolve from
their existing locations. Invalid or unwritable STACKS_DIR values produce a
warning and fall back to $DATA_DIR/stacks instead of aborting startup. With
this layout, local stack names must be unique across environments.

Hawser agents report their remote stacks directory on hello. That path is
persisted on the environment as hawser_stacks_dir so compose APIs and the UI
can show host paths rather than Dockhand staging paths. Staging paths are
remapped to and from the remote stack dir for compose files, backups, and
environment settings. Backup restore may write under either the default
staging root or the configured STACKS_DIR.

Co-authored-by: xd003 <xd003@users.noreply.github.com>
This commit is contained in:
Badal Singhandxd003 authored and GitHub committed 2026-08-31 18:54:27 +02:00
1 parent 53161a6718
commit 77686da02a
27 files changed
+9145 -190

No files matched your search

+27 -5
View File
@@ -1,11 +1,11 @@
import { json } from '@sveltejs/kit';
import { join } from 'path';
import { join, resolve, basename } from 'path';
import { existsSync, rmSync, renameSync } from 'fs';
import type { RequestHandler } from './$types';
import { getEnvironment, updateEnvironment, deleteEnvironment, getEnvironmentPublicIps, setEnvironmentPublicIp, deleteEnvironmentPublicIp, deleteEnvUpdateCheckSettings, deleteImagePruneSettings, getGitStacksForEnvironmentOnly, deleteGitStack, getBackupConfigs } from '$lib/server/db';
import { getEnvironment, updateEnvironment, deleteEnvironment, getEnvironmentPublicIps, setEnvironmentPublicIp, deleteEnvironmentPublicIp, deleteEnvUpdateCheckSettings, deleteImagePruneSettings, getGitStacksForEnvironmentOnly, deleteGitStack, getBackupConfigs, getStackSources } from '$lib/server/db';
import { clearDockerClientCache } from '$lib/server/docker';
import { deleteGitStackFiles, getGitReposDir } from '$lib/server/git';
import { getStacksDir } from '$lib/server/stacks';
import { getDefaultStacksDir, getLocalStacksDir, isLocalConnection, isStacksDirEnvSet } from '$lib/server/stacks';
import { authorize } from '$lib/server/authorize';
import { auditEnvironment } from '$lib/server/audit';
import { refreshSubprocessEnvironments } from '$lib/server/subprocess-manager';
@@ -116,7 +116,7 @@ export const PUT: RequestHandler = async (event) => {
// regardless of where they ultimately deploy — so the rename matters
// locally for every env type.
if (isRename) {
const stacksDir = getStacksDir();
const stacksDir = getDefaultStacksDir();
const gitReposDir = getGitReposDir();
const oldStacks = join(stacksDir, oldEnv.name);
const newStacks = join(stacksDir, data.name);
@@ -317,7 +317,7 @@ export const DELETE: RequestHandler = async (event) => {
// Clean up stack directory for this environment
// Safety: only delete subdirectory named after the env, never the parent
try {
const stacksDir = getStacksDir();
const stacksDir = getDefaultStacksDir();
const envStackDir = join(stacksDir, env.name);
if (envStackDir !== stacksDir && envStackDir.startsWith(stacksDir) && existsSync(envStackDir)) {
rmSync(envStackDir, { recursive: true, force: true });
@@ -326,6 +326,28 @@ export const DELETE: RequestHandler = async (event) => {
console.error(`Failed to clean up stack directory for environment "${env.name}":`, err);
}
// Flat STACKS_DIR layout: remove per-stack managed dirs for this local environment
if (isStacksDirEnvSet() && isLocalConnection(env)) {
try {
const localStacksDir = getLocalStacksDir();
const resolvedLocalRoot = resolve(localStacksDir);
const stackSources = await getStackSources(id);
for (const source of stackSources) {
const stackDir = join(localStacksDir, source.stackName);
const resolvedStackDir = resolve(stackDir);
if (
resolvedStackDir.startsWith(resolvedLocalRoot + '/') &&
basename(resolvedStackDir) === source.stackName &&
existsSync(stackDir)
) {
rmSync(stackDir, { recursive: true, force: true });
}
}
} catch (err) {
console.error(`Failed to clean up flat STACKS_DIR stacks for environment "${env.name}":`, err);
}
}
// Clean up git-repos directory for this environment
try {
const gitReposDir = getGitReposDir();