Skip to content

Modern Docker Management, Designed for Everyone

fix: handle discovered Compose project updates (#3711)

Kyle Mendell275aface140f
diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.go
index 7d2dc0e72..a2d868873 100644
--- a/backend/internal/common/errors.go
+++ b/backend/internal/common/errors.go
@@ -64,6 +64,7 @@ var (
ErrSessionRevoked = Classify(ErrUnauthorized, errors.Sentinel("Session has been revoked"))
ErrUpgradeInProgress = Classify(ErrConflict, errors.Sentinel("an upgrade is already in progress"))
ErrUpdateAllInProgress = Classify(ErrConflict, errors.Sentinel("an update-all job is already in progress"))
+ ErrUpdaterNoContainersMatched = Classify(ErrBadRequest, errors.Sentinel("no compose-managed containers matched the requested resources"))
ErrTemplateNotFound = Classify(ErrNotFound, errors.Sentinel("Template not found"))
ErrInvalidEnvKey = Classify(ErrValidation, errors.Sentinel("Invalid environment key"))
ErrGlobalVariableNotFound = Classify(ErrNotFound, errors.Sentinel("Global variable not found"))
diff --git a/backend/internal/project/project_listing.go b/backend/internal/project/project_listing.go
index beb267d07..5584c88a6 100644
--- a/backend/internal/project/project_listing.go
+++ b/backend/internal/project/project_listing.go
@@ -408,6 +408,9 @@ func buildDiscoveredComposeProjectUpdateRowsInternal(
) []project.Details {
containersByProject := make(map[string][]container.Summary)
for _, c := range composeContainers {
+ if dockerutil.ComposeServiceLabel(c.Labels) == "" {
+ continue
+ }
projectName := dockerutil.ComposeProjectLabel(c.Labels)
if projectName == "" {
continue
diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.go
index ab8041a4a..f052551c6 100644
--- a/backend/internal/project/service_test.go
+++ b/backend/internal/project/service_test.go
@@ -3684,7 +3684,6 @@ func TestBuildDiscoveredComposeProjectUpdateRowsInternal(t *testing.T) {
CurrentVersion: "7",
CheckTime: now,
}).Error)
-
rows := buildDiscoveredComposeProjectUpdateRowsInternal(ctx, []container.Summary{
{
ID: "media-web",
diff --git a/backend/internal/updater/handler.go b/backend/internal/updater/handler.go
index 09f5eca91..cf20aec77 100644
--- a/backend/internal/updater/handler.go
+++ b/backend/internal/updater/handler.go
@@ -6,6 +6,7 @@ import (
"emperror.dev/errors"
"github.com/danielgtaylor/huma/v2"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/middleware"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
@@ -115,6 +116,9 @@ func (h *UpdaterHandler) RunUpdater(ctx context.Context, input *RunUpdaterInput)
runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
out, err := h.updaterService.ApplyPending(runtimeCtx, options)
if err != nil {
+ if errors.Is(err, common.ErrBadRequest) {
+ return nil, huma.Error400BadRequest(errors.WithMessage(err, "Failed to run updater").Error())
+ }
return nil, huma.Error500InternalServerError(errors.WithMessage(err, "Failed to run updater").Error())
}
diff --git a/backend/internal/updater/service.go b/backend/internal/updater/service.go
index 64b08a628..2c4b73811 100644
--- a/backend/internal/updater/service.go
+++ b/backend/internal/updater/service.go
@@ -261,7 +261,7 @@ func (s *UpdaterService) applyScopedUpdatesInternal(ctx context.Context, options
return err
}
if len(containerIDs) == 0 {
- return errors.Errorf("no containers matched the requested %s resources", strings.TrimSpace(options.Type))
+ return common.ErrUpdaterNoContainersMatched
}
engineOpts := updater.Options{Force: options.ForceUpdate, DryRun: options.DryRun}
@@ -329,8 +329,10 @@ func (s *UpdaterService) containerIDsForProjectsInternal(ctx context.Context, pr
names := make(map[string]struct{}, len(projectRefs))
for _, ref := range projectRefs {
- name := ref
- if s.deps.Projects != nil {
+ name := strings.TrimSpace(ref)
+ if discoveredName, discovered := strings.CutPrefix(name, "compose:"); discovered {
+ name = discoveredName
+ } else if s.deps.Projects != nil {
if project, lookupErr := s.deps.Projects.GetProjectFromDatabaseByID(ctx, ref); lookupErr == nil && project != nil {
switch {
case project.ComposeProjectName != nil && strings.TrimSpace(*project.ComposeProjectName) != "":
@@ -350,6 +352,9 @@ func (s *UpdaterService) containerIDsForProjectsInternal(ctx context.Context, pr
var ids []string
for _, summary := range containers {
+ if dockerutil.ComposeServiceLabel(summary.Labels) == "" {
+ continue
+ }
project := strings.ToLower(strings.TrimSpace(dockerutil.ComposeProjectLabel(summary.Labels)))
if project == "" {
continue