Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: default secret and config UID/GID to "0" to prevent parsing errors (#2422)
Lewis Englandb50ac6ada449
diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.goindex 61c20a2c0..96bbd48f0 100644--- a/backend/internal/services/swarm_service.go+++ b/backend/internal/services/swarm_service.go@@ -349,6 +349,9 @@ func (s *SwarmService) CreateService(ctx context.Context, req swarmtypes.ServiceoptionsPayload = *req.Options}+ // Sanitize spec to avoid empty UID/GID in secret/config refs+ sanitizeServiceSpecInternal(&spec)+resp, err := dockerClient.ServiceCreate(ctx, dockerclient.ServiceCreateOptions{Spec: spec,EncodedRegistryAuth: optionsPayload.EncodedRegistryAuth,@@ -388,6 +391,9 @@ func (s *SwarmService) UpdateService(ctx context.Context, serviceID string, reqoptionsPayload = *req.Options}+ // Sanitize spec to avoid empty UID/GID in secret/config refs+ sanitizeServiceSpecInternal(&req.Spec)+resp, err := dockerClient.ServiceUpdate(ctx, serviceID, dockerclient.ServiceUpdateOptions{Version: swarm.Version{Index: versionIndex},Spec: req.Spec,@@ -2381,3 +2387,31 @@ func compareIntInternal(a, b int) int {}return 0}++func sanitizeServiceSpecInternal(spec *swarm.ServiceSpec) {+ if spec == nil || spec.TaskTemplate.ContainerSpec == nil {+ return+ }++ for _, ref := range spec.TaskTemplate.ContainerSpec.Secrets {+ if ref != nil && ref.File != nil {+ if strings.TrimSpace(ref.File.UID) == "" {+ ref.File.UID = "0"+ }+ if strings.TrimSpace(ref.File.GID) == "" {+ ref.File.GID = "0"+ }+ }+ }++ for _, ref := range spec.TaskTemplate.ContainerSpec.Configs {+ if ref != nil && ref.File != nil {+ if strings.TrimSpace(ref.File.UID) == "" {+ ref.File.UID = "0"+ }+ if strings.TrimSpace(ref.File.GID) == "" {+ ref.File.GID = "0"+ }+ }+ }+}diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine.go b/backend/pkg/libarcane/swarm/stack_deploy_engine.goindex 055999c03..d47fcf643 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine.go@@ -19,6 +19,7 @@ import (cerrdefs "github.com/containerd/errdefs""github.com/docker/compose/v5/pkg/api""github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/pkg/utils"swarmtypes "github.com/getarcaneapp/arcane/types/swarm""github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/network"@@ -925,8 +926,8 @@ func convertServiceSecretRefs(secrets []composegotypes.ServiceSecretConfig, secr}ref.File = &swarm.SecretReferenceFileTarget{Name: target,- UID: secret.UID,- GID: secret.GID,+ UID: utils.StringOrDefault(secret.UID, "0"),+ GID: utils.StringOrDefault(secret.GID, "0"),Mode: fileModeOrDefault(secret.Mode),}result = append(result, ref)@@ -954,8 +955,8 @@ func convertServiceConfigRefs(configs []composegotypes.ServiceConfigObjConfig, c}ref.File = &swarm.ConfigReferenceFileTarget{Name: target,- UID: cfg.UID,- GID: cfg.GID,+ UID: utils.StringOrDefault(cfg.UID, "0"),+ GID: utils.StringOrDefault(cfg.GID, "0"),Mode: fileModeOrDefault(cfg.Mode),}result = append(result, ref)diff --git a/backend/pkg/utils/string_util.go b/backend/pkg/utils/string_util.gonew file mode 100644index 000000000..b14732933--- /dev/null+++ b/backend/pkg/utils/string_util.go@@ -0,0 +1,12 @@+package utils++import "strings"++// StringOrDefault returns the trimmed value if non-empty, otherwise defaultValue.+func StringOrDefault(value, defaultValue string) string {+ value = strings.TrimSpace(value)+ if value == "" {+ return defaultValue+ }+ return value+}