refactor: variableize yaml lane node naming
This commit is contained in:
@@ -356,7 +356,7 @@ export function composeConfig(config: UniDeskConfig): { runtimeEnv: ComposeRunti
|
||||
|
||||
export function startStack(config: UniDeskConfig): unknown {
|
||||
const containers = dockerContainers(config);
|
||||
const deprecatedEntry = deprecatedD601HostComposeEntry(config, composeRuntimeEnvPreview(config), containers);
|
||||
const deprecatedEntry = deprecatedHostComposeEntry(config, composeRuntimeEnvPreview(config), containers);
|
||||
if (deprecatedEntry !== null) return deprecatedEntry;
|
||||
const runtimeEnv = writeComposeEnv(config, true);
|
||||
const compose = resolveComposeCommand(config, runtimeEnv.envFile);
|
||||
@@ -663,7 +663,7 @@ function dockerExec(config: UniDeskConfig, container: string, command: string[])
|
||||
|
||||
export async function stackStatus(config: UniDeskConfig): Promise<unknown> {
|
||||
const containers = dockerContainers(config);
|
||||
const deprecatedEntry = deprecatedD601HostComposeEntry(config, composeRuntimeEnvPreview(config), containers);
|
||||
const deprecatedEntry = deprecatedHostComposeEntry(config, composeRuntimeEnvPreview(config), containers);
|
||||
if (deprecatedEntry !== null) return deprecatedEntry;
|
||||
const runtimeEnv = writeComposeEnv(config, false);
|
||||
const runtimeRaw = existsSync(runtimeEnv.envFile) ? readFileSync(runtimeEnv.envFile, "utf8") : "";
|
||||
@@ -739,16 +739,16 @@ export async function stackStatus(config: UniDeskConfig): Promise<unknown> {
|
||||
};
|
||||
}
|
||||
|
||||
export function deprecatedD601HostComposeEntryForTest(config: UniDeskConfig, runtimeEnv: ComposeRuntimeEnv, containers: ContainerStatus[], currentRoot: string): DeprecatedHostComposeEntry | null {
|
||||
return deprecatedD601HostComposeEntry(config, runtimeEnv, containers, currentRoot);
|
||||
export function deprecatedHostComposeEntryForTest(config: UniDeskConfig, runtimeEnv: ComposeRuntimeEnv, containers: ContainerStatus[], currentRoot: string): DeprecatedHostComposeEntry | null {
|
||||
return deprecatedHostComposeEntry(config, runtimeEnv, containers, currentRoot);
|
||||
}
|
||||
|
||||
function deprecatedD601HostComposeEntry(config: UniDeskConfig, runtimeEnv: ComposeRuntimeEnv, containers: ContainerStatus[], currentRoot = repoRoot): DeprecatedHostComposeEntry | null {
|
||||
function deprecatedHostComposeEntry(config: UniDeskConfig, runtimeEnv: ComposeRuntimeEnv, containers: ContainerStatus[], currentRoot = repoRoot): DeprecatedHostComposeEntry | null {
|
||||
const cwd = resolve(currentRoot);
|
||||
const d601Workspaces = ["/home/ubuntu/unidesk", "/home/ubuntu/workspace/unidesk-dev", "/workspace/unidesk"];
|
||||
const cwdLooksD601 = d601Workspaces.some((workspace) => cwd === workspace || cwd.startsWith(`${workspace}/.worktree/`));
|
||||
const legacyHostWorkspaces = ["/home/ubuntu/unidesk", "/home/ubuntu/workspace/unidesk-dev", "/workspace/unidesk"];
|
||||
const cwdLooksLegacyHost = legacyHostWorkspaces.some((workspace) => cwd === workspace || cwd.startsWith(`${workspace}/.worktree/`));
|
||||
const upgradeRootLooksMainServer = config.providerGateway.upgrade.hostProjectRoot === "/root/unidesk";
|
||||
if (!cwdLooksD601 || !upgradeRootLooksMainServer || containers.length > 0) return null;
|
||||
if (!cwdLooksLegacyHost || !upgradeRootLooksMainServer || containers.length > 0) return null;
|
||||
const publicPorts = fixedPorts(config);
|
||||
const conflictingListeners = publicPorts
|
||||
.filter((item) => item.listening)
|
||||
|
||||
Reference in New Issue
Block a user