Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: skip excluded containers when collecting images for auto-update pull (#2473)
Giulio Savinic553aa94fec3
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 2ef5bc812..dd53b1669 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -965,6 +965,9 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Conif dcli == nil {return nil}++ excludedContainers := s.buildExcludedContainerSetInternal(ctx)+listResult, err := dcli.ContainerList(ctx, client.ContainerListOptions{All: false})if err != nil {return err@@ -977,6 +980,20 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Concontinue}+ if len(excludedContainers) > 0 {+ isExcluded := false+ for _, name := range c.Names {+ if excludedContainers[strings.TrimPrefix(name, "/")] {+ isExcluded = true+ break+ }+ }+ if isExcluded {+ slog.DebugContext(ctx, "collectUsedImagesFromContainersInternal: skipping excluded container", "containerId", c.ID, "names", c.Names)+ continue+ }+ }+imageRef := strings.TrimSpace(c.Image)if imageRef != "" && !isImageIDLikeReferenceInternal(imageRef) {out[s.normalizeRef(imageRef)] = struct{}{}@@ -1000,6 +1017,22 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Conreturn nil}+// buildExcludedContainerSetInternal returns the set of container names from the+// autoUpdateExcludedContainers setting. An empty map means no exclusions.+func (s *UpdaterService) buildExcludedContainerSetInternal(ctx context.Context) map[string]bool {+ raw := s.settingsService.GetStringSetting(ctx, "autoUpdateExcludedContainers", "")+ if raw == "" {+ return nil+ }+ excluded := make(map[string]bool)+ for p := range strings.SplitSeq(raw, ",") {+ if name := strings.TrimSpace(p); name != "" {+ excluded[name] = true+ }+ }+ return excluded+}+func isImageIDLikeReferenceInternal(ref string) bool {ref = strings.ToLower(strings.TrimSpace(ref))return strings.HasPrefix(ref, "sha256:")@@ -1232,15 +1265,7 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDlist := listResult.Itemsslog.DebugContext(ctx, "restartContainersUsingOldIDs: scanning containers for matching images", "containers", len(list), "oldIDMatches", len(oldIDToNewRef), "oldRefMatches", len(oldRefToNewRef))- // Parse excluded containers settings- excludedSetting := s.settingsService.GetStringSetting(ctx, "autoUpdateExcludedContainers", "")- excludedContainers := make(map[string]bool)- if excludedSetting != "" {- parts := strings.SplitSeq(excludedSetting, ",")- for p := range parts {- excludedContainers[strings.TrimSpace(p)] = true- }- }+ excludedContainers := s.buildExcludedContainerSetInternal(ctx)// Detect the Docker socket proxy container (if DOCKER_HOST is TCP) so we// can skip it during auto-update. Updating it would sever Arcane's owndiff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.goindex 732fa9050..bc9bc083d 100644--- a/backend/internal/services/updater_service_test.go+++ b/backend/internal/services/updater_service_test.go@@ -2,9 +2,13 @@ package servicesimport ("context"+ "encoding/json""errors""net"+ "net/http"+ "net/http/httptest""net/netip"+ "strings""testing""time"@@ -14,6 +18,7 @@ import (glsqlite "github.com/glebarez/sqlite""github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/network"+ dockerclient "github.com/moby/moby/client""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gorm.io/gorm"@@ -866,3 +871,78 @@ func TestDockerProxyContainerNameInternal(t *testing.T) {})}}++func setupUpdaterServiceSettingsDB(t *testing.T) *database.DB {+ t.Helper()+ db, err := gorm.Open(glsqlite.Open(":memory:"), &gorm.Config{})+ require.NoError(t, err)+ require.NoError(t, db.AutoMigrate(&models.SettingVariable{}))+ return &database.DB{DB: db}+}++func TestUpdaterService_BuildExcludedContainerSetInternal_Empty(t *testing.T) {+ ctx := context.Background()+ db := setupUpdaterServiceSettingsDB(t)+ settings, err := NewSettingsService(ctx, db)+ require.NoError(t, err)+ svc := &UpdaterService{settingsService: settings}++ excluded := svc.buildExcludedContainerSetInternal(ctx)+ assert.Nil(t, excluded, "empty exclusion setting should return nil map")+}++func TestUpdaterService_BuildExcludedContainerSetInternal_ParsesList(t *testing.T) {+ ctx := context.Background()+ db := setupUpdaterServiceSettingsDB(t)+ settings, err := NewSettingsService(ctx, db)+ require.NoError(t, err)+ require.NoError(t, settings.UpdateSetting(ctx, "autoUpdateExcludedContainers", "container-a, container-b , container-c"))++ svc := &UpdaterService{settingsService: settings}+ excluded := svc.buildExcludedContainerSetInternal(ctx)++ assert.True(t, excluded["container-a"])+ assert.True(t, excluded["container-b"])+ assert.True(t, excluded["container-c"])+ assert.False(t, excluded["container-d"])+}++// TestUpdaterService_CollectUsedImages_SkipsExcludedContainers verifies that images+// used ONLY by excluded containers are not included in the used-images set, so the+// auto-update job does not pull images for those containers.+func TestUpdaterService_CollectUsedImages_SkipsExcludedContainers(t *testing.T) {+ ctx := context.Background()+ db := setupUpdaterServiceSettingsDB(t)+ settings, err := NewSettingsService(ctx, db)+ require.NoError(t, err)+ require.NoError(t, settings.UpdateSetting(ctx, "autoUpdateExcludedContainers", "excluded-container"))++ // Serve a fake Docker daemon that returns two containers: one excluded, one not.+ fakeContainers := []container.Summary{+ {ID: "c1", Names: []string{"/excluded-container"}, Image: "nginx:latest"},+ {ID: "c2", Names: []string{"/active-container"}, Image: "redis:7"},+ }+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ if strings.HasSuffix(r.URL.Path, "/containers/json") {+ w.Header().Set("Content-Type", "application/json")+ json.NewEncoder(w).Encode(fakeContainers)+ return+ }+ http.NotFound(w, r)+ }))+ defer srv.Close()++ dcli, err := dockerclient.NewClientWithOpts(+ dockerclient.WithHost("tcp://"+srv.Listener.Addr().String()),+ dockerclient.WithVersion("1.46"),+ )+ require.NoError(t, err)++ svc := &UpdaterService{settingsService: settings}+ out := map[string]struct{}{}++ require.NoError(t, svc.collectUsedImagesFromContainersInternal(ctx, dcli, out))++ assert.NotContains(t, out, svc.normalizeRef("nginx:latest"), "excluded container image must not be collected")+ assert.Contains(t, out, svc.normalizeRef("redis:7"), "non-excluded container image must be collected")+}