Skip to content

Modern Docker Management, Designed for Everyone

fix: compose network race condition (#274)

Kyle Mendell2a4401ba931c
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 52f69945b..ddb94e70d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,6 @@
"markdown": false,
"scminput": false,
"typescript": true
- }
+ },
+ "typescript.tsdk": "node_modules/typescript/lib"
}
diff --git a/src/lib/components/LogViewer.svelte b/src/lib/components/LogViewer.svelte
index 498704c67..d0c31ac57 100644
--- a/src/lib/components/LogViewer.svelte
+++ b/src/lib/components/LogViewer.svelte
@@ -6,13 +6,13 @@
timestamp: string;
level: 'stdout' | 'stderr' | 'info' | 'error';
message: string;
- service?: string; // Add service field for stack logs
+ service?: string;
containerId?: string;
}
interface Props {
containerId?: string | null;
- stackId?: string | null; // Add stackId prop
+ stackId?: string | null;
type?: 'container' | 'stack';
maxLines?: number;
autoScroll?: boolean;
diff --git a/src/lib/components/action-buttons.svelte b/src/lib/components/action-buttons.svelte
index 05b6f0d35..9192db526 100644
--- a/src/lib/components/action-buttons.svelte
+++ b/src/lib/components/action-buttons.svelte
@@ -34,7 +34,8 @@
restart: false,
remove: false,
pulling: false,
- redeploy: false
+ redeploy: false,
+ validating: false
});
const isRunning = $derived(itemState === 'running' || (type === 'stack' && itemState === 'partially running'));
@@ -46,6 +47,7 @@
isLoading.remove = loading.remove ?? false;
isLoading.restart = loading.restart ?? false;
isLoading.redeploy = loading.redeploy ?? false;
+ isLoading.validating = loading.validating ?? false;
});
function confirmAction(action: string) {
@@ -124,7 +126,7 @@
handleApiResultWithCallbacks({
result: await tryCatch(stackApi.validate(id)),
message: `Failed to Validate stack`,
- setLoadingState: (value) => (isLoading.start = value),
+ setLoadingState: (value) => (isLoading.validating = value),
onSuccess: async () => {
handleApiResultWithCallbacks({
result: await tryCatch(stackApi.deploy(id)),
diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte
index a0395a2b0..ef1245d44 100644
--- a/src/lib/components/sidebar.svelte
+++ b/src/lib/components/sidebar.svelte
@@ -40,11 +40,9 @@
{ href: '/settings/docker', label: 'Docker', icon: Database },
{ href: '/settings/templates', label: 'Templates', icon: LayoutTemplate },
{ href: '/settings/users', label: 'Users', icon: UserIcon },
- // { href: '/settings/rbac', label: 'RBAC', icon: ShieldCheck },
{ href: '/settings/security', label: 'Security', icon: Shield }
// { href: '/settings/notifications', label: 'Notifications', icon: Bell },
- // { href: '/settings/appearance', label: 'Appearance', icon: Palette }
]
}
] as MenuItem[],
diff --git a/src/lib/services/docker/stack-custom-service.ts b/src/lib/services/docker/stack-custom-service.ts
index e8c94ff32..6f811ac52 100644
--- a/src/lib/services/docker/stack-custom-service.ts
+++ b/src/lib/services/docker/stack-custom-service.ts
@@ -1059,7 +1059,7 @@ export async function deployStack(stackId: string, options: { profiles?: string[
await Promise.all(imagePullPromises);
- // Create networks for deployable services only
+ // Create networks for deployable services
await createStackNetworks(docker, stackId, filteredComposeData.networks || {});
// Deploy filtered services
@@ -1566,18 +1566,31 @@ async function createStackNetworks(docker: Dockerode, stackId: string, networks:
if (!networks || Object.keys(networks).length === 0) {
const defaultNetworkName = `${stackId}_default`;
try {
- await docker.createNetwork({
- Name: defaultNetworkName,
- Driver: 'bridge',
- Labels: {
- 'com.docker.compose.project': stackId,
- 'com.docker.compose.network': 'default'
- }
- });
+ // Check if the network exists
+ const existingNetworks = await docker.listNetworks({ filters: { name: [defaultNetworkName] } });
+ if (existingNetworks.length === 0) {
+ // Network doesn't exist, create it
+ console.log(`Creating default network: ${defaultNetworkName}`);
+ const createdNetwork = await docker.createNetwork({
+ Name: defaultNetworkName,
+ Driver: 'bridge',
+ Labels: {
+ 'com.docker.compose.project': stackId,
+ 'com.docker.compose.network': 'default'
+ }
+ });
+ console.log(`Successfully created default network: ${defaultNetworkName} (ID: ${createdNetwork.id})`);
+
+ // Wait for network to be ready
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ } else {
+ console.log(`Default network ${defaultNetworkName} already exists, reusing it.`);
+ }
} catch (err: any) {
if (err.statusCode === 409) {
console.log(`Default network ${defaultNetworkName} already exists, reusing it.`);
} else {
+ console.error(`Error creating default network ${defaultNetworkName}:`, err);
throw err;
}
}
@@ -1595,34 +1608,74 @@ async function createStackNetworks(docker: Dockerode, stackId: string, networks:
// Skip external networks
if (networkConfig.external) {
- console.log(`Using external network: ${networkConfig.name || networkName}`);
+ const externalNetworkName = networkConfig.name || networkName;
+ console.log(`Using external network: ${externalNetworkName}`);
+
+ // Verify external network exists
+ try {
+ const existingNetworks = await docker.listNetworks({ filters: { name: [externalNetworkName] } });
+ if (existingNetworks.length === 0) {
+ throw new Error(`External network '${externalNetworkName}' not found`);
+ }
+ console.log(`Verified external network exists: ${externalNetworkName}`);
+ } catch (verifyError) {
+ console.error(`Failed to verify external network ${externalNetworkName}:`, verifyError);
+ throw new Error(`External network '${externalNetworkName}' is not available: ${verifyError instanceof Error ? verifyError.message : String(verifyError)}`);
+ }
continue;
}
// Network creation logic for non-external networks
+ // FIX: Use the explicit name if provided, otherwise use prefixed convention
+ const networkToCreateName = networkConfig.name || `${stackId}_${networkName}`;
+
+ console.log(`Network "${networkName}" -> Creating with name: "${networkToCreateName}" (explicit name: ${networkConfig.name ? 'yes' : 'no'})`);
+
const networkToCreate = {
- Name: networkConfig.name || `${stackId}_${networkName}`,
+ Name: networkToCreateName,
Driver: networkConfig.driver || 'bridge',
Labels: {
'com.docker.compose.project': stackId,
'com.docker.compose.network': networkName
},
- Options: networkConfig.driver_opts || {}
+ Options: networkConfig.driver_opts || {},
+ // Add IPAM configuration if specified
+ ...(networkConfig.ipam && { IPAM: networkConfig.ipam })
};
try {
- console.log(`Creating network: ${networkToCreate.Name}`);
- await docker.createNetwork(networkToCreate);
- console.log(`Successfully created network: ${networkToCreate.Name}`);
+ // Check if the network exists by name
+ const existingNetworks = await docker.listNetworks({ filters: { name: [networkToCreateName] } });
+ if (existingNetworks.length === 0) {
+ // Network doesn't exist, create it
+ console.log(`Creating network: ${networkToCreate.Name}`);
+ const createdNetwork = await docker.createNetwork(networkToCreate);
+ console.log(`Successfully created network: ${networkToCreate.Name} (ID: ${createdNetwork.id})`);
+
+ // Wait for network to be fully ready before proceeding
+ await new Promise((resolve) => setTimeout(resolve, 200));
+
+ // Verify the network was created successfully
+ const verifyNetworks = await docker.listNetworks({ filters: { name: [networkToCreateName] } });
+ if (verifyNetworks.length === 0) {
+ throw new Error(`Network ${networkToCreateName} was created but cannot be found`);
+ }
+ console.log(`Verified network creation: ${networkToCreateName}`);
+ } else {
+ console.log(`Network ${networkToCreate.Name} already exists, reusing it.`);
+ }
} catch (err: any) {
if (err.statusCode === 409) {
- console.log(`Network ${networkToCreate.Name} already exists, reusing it.`);
+ console.log(`Network ${networkToCreate.Name} already exists (409), reusing it.`);
} else {
console.error(`Error creating network ${networkToCreate.Name}:`, err);
throw err;
}
}
}
+
+ // Add a final wait to ensure all networks are ready
+ console.log(`All networks for stack ${stackId} are ready`);
}
/**
@@ -1832,20 +1885,32 @@ async function createAndStartServices(docker: Dockerode, stackId: string, compos
if (serviceConfig.working_dir) containerConfig.WorkingDir = serviceConfig.working_dir;
if (serviceConfig.user) containerConfig.User = serviceConfig.user;
- // Handle networking
if (serviceConfig.network_mode) {
containerConfig.HostConfig.NetworkMode = serviceConfig.network_mode;
} else if (serviceConfig.networks) {
- // Handle Docker Compose networks
const networks = Array.isArray(serviceConfig.networks) ? serviceConfig.networks : Object.keys(serviceConfig.networks);
if (networks.length > 0) {
const primaryNetwork = networks[0];
const networkDefinition = processedComposeData.networks?.[primaryNetwork];
- const fullNetworkName = networkDefinition?.external ? networkDefinition.name || primaryNetwork : `${stackId}_${primaryNetwork}`;
- // ALWAYS set NetworkMode first
+ // FIX: Respect explicit network names from compose spec
+ let fullNetworkName: string;
+ if (networkDefinition?.external) {
+ // External network - use the specified name or default to network key
+ fullNetworkName = networkDefinition.name || primaryNetwork;
+ } else if (networkDefinition?.name) {
+ // Network has explicit name - use it directly (no prefix)
+ fullNetworkName = networkDefinition.name;
+ } else {
+ // No explicit name - use Docker Compose convention with project prefix
+ fullNetworkName = `${stackId}_${primaryNetwork}`;
+ }
+
+ console.log(`Service "${serviceName}" primary network "${primaryNetwork}" -> Using network name: "${fullNetworkName}" (explicit: ${networkDefinition?.name ? 'yes' : 'no'})`);
+
containerConfig.HostConfig.NetworkMode = fullNetworkName;
+ // Rest of the network configuration logic...
if (!Array.isArray(serviceConfig.networks)) {
const networkConfig = serviceConfig.networks[primaryNetwork];
if (networkConfig && typeof networkConfig === 'object') {
@@ -1892,7 +1957,18 @@ async function createAndStartServices(docker: Dockerode, stackId: string, compos
for (const netName of additionalNetworks) {
try {
const networkDefinition = processedComposeData.networks?.[netName];
- const fullNetworkName = networkDefinition?.external ? networkDefinition.name || netName : `${stackId}_${netName}`;
+
+ // FIX: Same logic for additional networks
+ let fullNetworkName: string;
+ if (networkDefinition?.external) {
+ fullNetworkName = networkDefinition.name || netName;
+ } else if (networkDefinition?.name) {
+ // Network has explicit name - use it directly
+ fullNetworkName = networkDefinition.name;
+ } else {
+ // No explicit name - use Docker Compose convention
+ fullNetworkName = `${stackId}_${netName}`;
+ }
const endpointConfig: any = {};
diff --git a/src/lib/types/loading-states.type.ts b/src/lib/types/loading-states.type.ts
index fc1626860..9b1a44e38 100644
--- a/src/lib/types/loading-states.type.ts
+++ b/src/lib/types/loading-states.type.ts
@@ -6,4 +6,5 @@ export type LoadingStates = {
deploy?: boolean;
redeploy?: boolean;
remove?: boolean;
+ validating?: boolean;
};