Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: unable to create ipvlan or macvlan networks
Kyle Mendell5f4e9e02eb06
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex acb04901b..83cdc701e 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1292,6 +1292,8 @@"network_enable_ipam_label": "Enable IPAM Configuration","network_subnet_description": "Network subnet in CIDR notation","network_gateway_description": "Gateway IP address for the network",+ "network_driver_options_placeholder": "parent=eth0\ncom.docker.network.bridge.name=docker0",+ "network_driver_options_description": "Enter driver-specific options as key=value pairs (e.g., parent=eth0 for macvlan), one per line","network_interface": "Network interface","_comment_form_volume": "=== FORM - CREATE VOLUME ===",diff --git a/frontend/src/lib/components/sheets/create-network-sheet.svelte b/frontend/src/lib/components/sheets/create-network-sheet.svelteindex b3d9b8546..796595d10 100644--- a/frontend/src/lib/components/sheets/create-network-sheet.svelte+++ b/frontend/src/lib/components/sheets/create-network-sheet.svelte@@ -37,6 +37,7 @@checkDuplicate: z.boolean().default(true),internal: z.boolean().default(false),networkLabels: z.string().optional().default(''),+ driverOptions: z.string().optional().default(''),enableIpam: z.boolean().default(false),subnet: z.string().optional().default(''),gateway: z.string().optional().default('')@@ -48,6 +49,7 @@checkDuplicate: true,internal: false,networkLabels: '',+ driverOptions: '',enableIpam: false,subnet: '',gateway: ''@@ -103,12 +105,16 @@const finalLabels = { ...textareaLabels, ...dynamicLabels };+ // Parse driver options (e.g., parent=eth0 for macvlan)+ const driverOptions = parseKeyValuePairs(data.driverOptions || '');+const options: NetworkCreateOptions = {Name: data.networkName.trim(),Driver: data.networkDriver,CheckDuplicate: data.checkDuplicate,Internal: data.internal,- Labels: Object.keys(finalLabels).length > 0 ? finalLabels : undefined+ Labels: Object.keys(finalLabels).length > 0 ? finalLabels : undefined,+ Options: Object.keys(driverOptions).length > 0 ? driverOptions : undefined};// Add IPAM configuration if enabled@@ -142,6 +148,7 @@$inputs.checkDuplicate.value = true;$inputs.internal.value = false;$inputs.networkLabels.value = '';+ $inputs.driverOptions.value = '';$inputs.enableIpam.value = false;$inputs.subnet.value = '';$inputs.gateway.value = '';@@ -248,11 +255,32 @@<p class="text-muted-foreground text-xs">{m.network_labels_description()}</p></div></div>- </Accordion.Content>- </Accordion.Item>+ </Accordion.Content>+ </Accordion.Item>++ <Accordion.Item value="options">+ <Accordion.Trigger class="text-sm font-medium">{m.common_driver_options()}</Accordion.Trigger>+ <Accordion.Content class="pt-4">+ <div class="space-y-2">+ <Label for="driver-options" class="text-sm font-medium">{m.common_driver_options()}</Label>+ <Textarea+ id="driver-options"+ placeholder={m.network_driver_options_placeholder()}+ disabled={isLoading}+ rows={3}+ bind:value={$inputs.driverOptions.value}+ class={$inputs.driverOptions.error ? 'border-destructive' : ''}+ />+ {#if $inputs.driverOptions.error}+ <p class="text-destructive text-xs">{$inputs.driverOptions.error}</p>+ {/if}+ <p class="text-muted-foreground text-xs">{m.network_driver_options_description()}</p>+ </div>+ </Accordion.Content>+ </Accordion.Item>- <Accordion.Item value="ipam">- <Accordion.Trigger class="text-sm font-medium">{m.networks_ipam_title()}</Accordion.Trigger>+ <Accordion.Item value="ipam">+ <Accordion.Trigger class="text-sm font-medium">{m.networks_ipam_title()}</Accordion.Trigger><Accordion.Content class="pt-4"><div class="space-y-4"><div class="flex items-center space-x-2">diff --git a/frontend/src/lib/services/network-service.ts b/frontend/src/lib/services/network-service.tsindex 19acc6abb..7a396f9ff 100644--- a/frontend/src/lib/services/network-service.ts+++ b/frontend/src/lib/services/network-service.ts@@ -1,6 +1,6 @@import BaseAPIService from './api-service';import { environmentStore } from '$lib/stores/environment.store.svelte';-import type { NetworkSummaryDto, NetworkUsageCounts } from '$lib/types/network.type';+import type { NetworkSummaryDto, NetworkUsageCounts, NetworkCreateRequest } from '$lib/types/network.type';import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';import type { NetworkCreateOptions } from 'dockerode';import { transformPaginationParams } from '$lib/utils/params.util';@@ -26,7 +26,21 @@ export class NetworkService extends BaseAPIService {async createNetwork(options: NetworkCreateOptions): Promise<any> {const envId = await environmentStore.getCurrentEnvironmentId();- return this.handleResponse(this.api.post(`/environments/${envId}/networks`, options));+ const request: NetworkCreateRequest = {+ name: options.Name || '',+ options: {+ Driver: options.Driver,+ CheckDuplicate: options.CheckDuplicate,+ Internal: options.Internal,+ Attachable: options.Attachable,+ Ingress: options.Ingress,+ IPAM: options.IPAM,+ EnableIPv6: options.EnableIPv6,+ Options: options.Options,+ Labels: options.Labels+ }+ };+ return this.handleResponse(this.api.post(`/environments/${envId}/networks`, request));}async deleteNetwork(networkId: string): Promise<any> {diff --git a/frontend/src/lib/types/network.type.ts b/frontend/src/lib/types/network.type.tsindex 471ab1dfb..788594686 100644--- a/frontend/src/lib/types/network.type.ts+++ b/frontend/src/lib/types/network.type.ts@@ -11,6 +11,21 @@ export interface NetworkCreateOptions {checkDuplicate?: boolean;}+export interface NetworkCreateRequest {+ name: string;+ options: {+ Driver?: string;+ CheckDuplicate?: boolean;+ Internal?: boolean;+ Attachable?: boolean;+ Ingress?: boolean;+ IPAM?: IPAMConfig;+ EnableIPv6?: boolean;+ Options?: Record<string, string>;+ Labels?: Record<string, string>;+ };+}+export interface NetworkUsageCounts {networksInuse: number;networksUnused: number;