Skip to content

Modern Docker Management, Designed for Everyone

fix: auto updater issues with certain network modes (#1205)

Kyle Mendell4b0fd91f3951
diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.go
index c18fd65d0..f843149c4 100644
--- a/backend/cli/upgrade/upgrade.go
+++ b/backend/cli/upgrade/upgrade.go
@@ -336,25 +336,44 @@ func upgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
hostConfig := oldContainer.HostConfig
+ // Fix for "conflicting options: hostname and the network mode"
+ // When network mode is "host" or "container:...", Hostname must be empty
+ nm := hostConfig.NetworkMode
+ if nm.IsHost() || nm.IsContainer() {
+ config.Hostname = ""
+ config.Domainname = ""
+ }
+
+ // Fix for "conflicting options: port exposing and the container type network mode"
+ // When network mode is "container:...", port mappings are not allowed
+ if nm.IsContainer() {
+ config.ExposedPorts = nil
+ hostConfig.PortBindings = nil
+ hostConfig.PublishAllPorts = false
+ }
+
// Build network config - preserve all network settings including IP addresses
- networkConfig := &network.NetworkingConfig{
- EndpointsConfig: make(map[string]*network.EndpointSettings),
- }
- for networkName, networkSettings := range oldContainer.NetworkSettings.Networks {
- networkConfig.EndpointsConfig[networkName] = &network.EndpointSettings{
- IPAMConfig: networkSettings.IPAMConfig,
- Links: networkSettings.Links,
- Aliases: networkSettings.Aliases,
- NetworkID: networkSettings.NetworkID,
- EndpointID: networkSettings.EndpointID,
- Gateway: networkSettings.Gateway,
- IPAddress: networkSettings.IPAddress,
- IPPrefixLen: networkSettings.IPPrefixLen,
- IPv6Gateway: networkSettings.IPv6Gateway,
- GlobalIPv6Address: networkSettings.GlobalIPv6Address,
- GlobalIPv6PrefixLen: networkSettings.GlobalIPv6PrefixLen,
- MacAddress: networkSettings.MacAddress,
- DriverOpts: networkSettings.DriverOpts,
+ var networkConfig *network.NetworkingConfig
+ if !nm.IsContainer() {
+ networkConfig = &network.NetworkingConfig{
+ EndpointsConfig: make(map[string]*network.EndpointSettings),
+ }
+ for networkName, networkSettings := range oldContainer.NetworkSettings.Networks {
+ networkConfig.EndpointsConfig[networkName] = &network.EndpointSettings{
+ IPAMConfig: networkSettings.IPAMConfig,
+ Links: networkSettings.Links,
+ Aliases: networkSettings.Aliases,
+ NetworkID: networkSettings.NetworkID,
+ EndpointID: networkSettings.EndpointID,
+ Gateway: networkSettings.Gateway,
+ IPAddress: networkSettings.IPAddress,
+ IPPrefixLen: networkSettings.IPPrefixLen,
+ IPv6Gateway: networkSettings.IPv6Gateway,
+ GlobalIPv6Address: networkSettings.GlobalIPv6Address,
+ GlobalIPv6PrefixLen: networkSettings.GlobalIPv6PrefixLen,
+ MacAddress: networkSettings.MacAddress,
+ DriverOpts: networkSettings.DriverOpts,
+ }
}
}
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index 59599f1e4..c70a76cce 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -517,13 +517,26 @@ func (s *UpdaterService) updateContainer(ctx context.Context, cnt container.Summ
// Fix for "conflicting options: hostname and the network mode"
// When network mode is "host" or "container:...", Hostname must be empty
- nm := string(inspect.HostConfig.NetworkMode)
- if nm == "host" || strings.HasPrefix(nm, "container:") {
+ nm := inspect.HostConfig.NetworkMode
+ if nm.IsHost() || nm.IsContainer() {
cfg.Hostname = ""
cfg.Domainname = ""
}
- resp, err := dcli.ContainerCreate(ctx, cfg, inspect.HostConfig, &network.NetworkingConfig{EndpointsConfig: inspect.NetworkSettings.Networks}, nil, inspect.Name)
+ // Fix for "conflicting options: port exposing and the container type network mode"
+ // When network mode is "container:...", port mappings are not allowed
+ if nm.IsContainer() {
+ cfg.ExposedPorts = nil
+ inspect.HostConfig.PortBindings = nil
+ inspect.HostConfig.PublishAllPorts = false
+ }
+
+ var networkingConfig *network.NetworkingConfig
+ if !nm.IsContainer() {
+ networkingConfig = &network.NetworkingConfig{EndpointsConfig: inspect.NetworkSettings.Networks}
+ }
+
+ resp, err := dcli.ContainerCreate(ctx, cfg, inspect.HostConfig, networkingConfig, nil, inspect.Name)
if err != nil {
slog.DebugContext(ctx, "updateContainer: create failed", "containerName", inspect.Name, "err", err)
return fmt.Errorf("create: %w", err)
diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelte
index 9716f69d4..721345c9e 100644
--- a/frontend/src/routes/(app)/settings/+layout.svelte
+++ b/frontend/src/routes/(app)/settings/+layout.svelte
@@ -3,7 +3,7 @@
import { goto, beforeNavigate } from '$app/navigation';
import { setContext } from 'svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon, SaveIcon, ResetIcon } from '$lib/icons';
+ import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon } from '$lib/icons';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
import { m } from '$lib/paraglide/messages';
import settingsStore from '$lib/stores/config-store';