Skip to content

Modern Docker Management, Designed for Everyone

fix: allow self-upgrade helpers through Wollomatic socket proxy (#4383)

Kyle Mendell9e2e9f4471e3
diff --git a/backend/internal/system/children/upgrade/service.go b/backend/internal/system/children/upgrade/service.go
index 2a3b3b034..e243a302e 100644
--- a/backend/internal/system/children/upgrade/service.go
+++ b/backend/internal/system/children/upgrade/service.go
@@ -25,6 +25,7 @@ import (
"github.com/italypaleale/francis/builtin/workflow"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/mount"
+ "github.com/moby/moby/api/types/network"
"github.com/moby/moby/client"
"github.com/opencontainers/go-digest"
"go.getarcane.app/docker"
@@ -429,11 +430,21 @@ func (s *Service) runPreparedUpgrade(ctx context.Context, prepared *preparedUpgr
}
}
+ var networkingConfig *network.NetworkingConfig
+ if networkMode != "" && networkMode.IsUserDefined() {
+ networkingConfig = &network.NetworkingConfig{
+ EndpointsConfig: map[string]*network.EndpointSettings{
+ string(networkMode): {Aliases: []string{"arcane-upgrader"}},
+ },
+ }
+ }
+
upgraderName := fmt.Sprintf("%s-upgrader-%d", prepared.containerName, time.Now().Unix())
resp, err := dockerClient.ContainerCreate(ctx, client.ContainerCreateOptions{
- Config: config,
- HostConfig: hostConfig,
- Name: upgraderName,
+ Config: config,
+ HostConfig: hostConfig,
+ NetworkingConfig: networkingConfig,
+ Name: upgraderName,
})
if err != nil {
return "", fmt.Errorf("create upgrader container: %w", err)
diff --git a/tests/setup/compose-proxy.yaml b/tests/setup/compose-proxy.yaml
index c561b1ee7..abf18d095 100644
--- a/tests/setup/compose-proxy.yaml
+++ b/tests/setup/compose-proxy.yaml
@@ -25,7 +25,7 @@ services:
user: '0:0'
command:
- '-listenip=0.0.0.0'
- - '-allowfrom=arcane'
+ - '-allowfrom=arcane,arcane-upgrader'
- '-allowhealthcheck'
- '-allowGET=(/v[\d.]+)?/_ping'
- '-allowGET=(/v[\d.]+)?/events(/.*)?'