Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: icon catalog and passthrough (#2835)
Kyle Mendell72c6f23e143c
diff --git a/backend/internal/configschema/schema_test.go b/backend/internal/configschema/schema_test.goindex c000f4567..b23d49e6e 100644--- a/backend/internal/configschema/schema_test.go+++ b/backend/internal/configschema/schema_test.go@@ -302,6 +302,7 @@ var expectedSettingOverrideKeys = []string{"gitSyncMaxFiles","gitSyncMaxTotalSizeMb","httpClientTimeout",+ "iconCatalog","keyboardShortcutsEnabled","maxImageUploadSize","mobileNavigationMode",diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex a6a86c666..e0be72d1f 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -77,6 +77,7 @@ type Settings struct {DefaultShell SettingVariable `key:"defaultShell" meta:"label=Default Shell;type=text;keywords=shell,default,shellpath,path,login;category=general;description=Default shell to use for commands"`EnvironmentHealthInterval SettingVariable `key:"environmentHealthInterval" meta:"label=Environment Health Check Interval;type=cron;keywords=environment,health,check,interval,frequency,heartbeat,status,monitoring,uptime,jobs,schedule;description=How often to check environment connectivity (cron expression)" catmeta:"id=jobschedule;title=Job Schedule;icon=jobs;url=/settings/jobs;description=Configure how often Arcane background jobs run"`ApplicationTheme SettingVariable `key:"applicationTheme,public,local" meta:"label=Application Theme;type=select;keywords=theme,appearance,style,visual,palette,background,interface,ui;category=appearance;description=Choose the overall visual theme for the application"`+ IconCatalog SettingVariable `key:"iconCatalog,public,local" meta:"label=Icon Catalog;type=select;keywords=icon,catalog,selfhst,dashboard-icons,appearance,container,project;category=appearance;description=Choose the catalog used to resolve project and container icon slugs"`AccentColor SettingVariable `key:"accentColor,public,local" meta:"label=Accent Color;type=text;keywords=color,accent,theme,css,appearance,ui;category=general;description=Primary accent color for UI"`OledMode SettingVariable `key:"oledMode,public,local" meta:"label=OLED Mode;type=boolean;keywords=oled,dark,theme,black,amoled,appearance,display;category=general;description=Use true-black backgrounds for OLED displays (only active in dark mode)"`diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex da524c408..6b887dd68 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -22,6 +22,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/projects""github.com/getarcaneapp/arcane/backend/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"containertypes "github.com/getarcaneapp/arcane/types/container""github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image"@@ -41,11 +42,13 @@ type ContainerService struct {projectService *ProjectServicestatsHistory containerstats.StoreupdateInfoCache *cache.KeyedCache[string, *imagetypes.UpdateInfo]+ iconMetaCache *cache.TTL[projects.ArcaneComposeMetadata]}const (- containerGroupByProject = "project"- containerNoProjectGroup = "No Project"+ containerGroupByProject = "project"+ containerNoProjectGroup = "No Project"+ containerIconMetadataTTL = 5 * time.Second)type ContainerListResult struct {@@ -64,6 +67,7 @@ func NewContainerService(ctx context.Context, db *database.DB, eventService *EvesettingsService: settingsService,projectService: projectService,updateInfoCache: cache.NewKeyed[string, *imagetypes.UpdateInfo](),+ iconMetaCache: cache.NewTTL[projects.ArcaneComposeMetadata](containerIconMetadataTTL),}svc.subscribeUpdateInfoCacheInvalidationInternal(ctx)return svc@@ -638,6 +642,7 @@ func (s *ContainerService) GetContainerDetails(ctx context.Context, id string) (details := containertypes.NewDetails(containerInspect)currentContainerID, currentContainerErr := dockerutils.GetCurrentContainerID()details.RedeployDisabled = libupdater.ShouldDisableArcaneServerRedeploy(details.Labels, details.ID, currentContainerID, currentContainerErr)+ s.applyContainerDetailsIconInternal(ctx, &details)return details, nil}@@ -902,7 +907,7 @@ func (s *ContainerService) ListContainersPaginated(imageIDs := collectImageIDs(dockerContainers)updateInfoMap := s.getUpdateInfoMap(ctx, imageIDs)currentContainerID, currentContainerErr := dockerutils.GetCurrentContainerID()- items := s.buildContainerSummaries(dockerContainers, updateInfoMap, currentContainerID, currentContainerErr)+ items := s.buildContainerSummaries(ctx, dockerContainers, updateInfoMap, currentContainerID, currentContainerErr)config := s.buildContainerPaginationConfig()counts := s.calculateContainerStatusCounts(items)@@ -1114,19 +1119,102 @@ func (s *ContainerService) getUpdateInfoMap(ctx context.Context, imageIDs []strireturn updateInfoMap}-func (s *ContainerService) buildContainerSummaries(containers []container.Summary, updateInfoMap map[string]*imagetypes.UpdateInfo, currentContainerID string, currentContainerErr error) []containertypes.Summary {+func (s *ContainerService) buildContainerSummaries(ctx context.Context, containers []container.Summary, updateInfoMap map[string]*imagetypes.UpdateInfo, currentContainerID string, currentContainerErr error) []containertypes.Summary {items := make([]containertypes.Summary, 0, len(containers))+ metadataByProject := map[string]projects.ArcaneComposeMetadata{}for _, dc := range containers {summary := containertypes.NewSummary(dc)if info, exists := updateInfoMap[dc.ImageID]; exists {summary.UpdateInfo = info}summary.RedeployDisabled = libupdater.ShouldDisableArcaneServerRedeploy(summary.Labels, summary.ID, currentContainerID, currentContainerErr)+ s.applyContainerSummaryIconInternal(ctx, &summary, metadataByProject)items = append(items, summary)}return items}+func (s *ContainerService) applyContainerSummaryIconInternal(ctx context.Context, summary *containertypes.Summary, metadataByProject map[string]projects.ArcaneComposeMetadata) {+ if summary == nil {+ return+ }+ resolvedIcon := s.resolveContainerIconInternal(ctx, summary.Labels, metadataByProject)+ summary.IconLightURL = resolvedIcon.IconLightURL+ summary.IconDarkURL = resolvedIcon.IconDarkURL+}++func (s *ContainerService) applyContainerDetailsIconInternal(ctx context.Context, details *containertypes.Details) {+ if details == nil {+ return+ }+ resolvedIcon := s.resolveContainerIconInternal(ctx, details.Labels, nil)+ details.IconLightURL = resolvedIcon.IconLightURL+ details.IconDarkURL = resolvedIcon.IconDarkURL+}++func (s *ContainerService) resolveContainerIconInternal(ctx context.Context, labels map[string]string, metadataByProject map[string]projects.ArcaneComposeMetadata) iconcatalog.ResolvedIconSet {+ explicitIcon := projects.FindArcaneIconSet(labels)+ if iconSetHasBothVariantsInternal(explicitIcon) {+ return s.resolveIconSetInternal(ctx, explicitIcon)+ }++ projectName := dockerutils.ComposeProjectLabel(labels)+ if projectName == "" || s == nil || s.projectService == nil {+ return s.resolveIconSetInternal(ctx, explicitIcon)+ }++ meta := s.getCachedProjectIconMetadataInternal(ctx, projectName, metadataByProject)++ serviceName := dockerutils.ComposeServiceLabel(labels)+ return s.resolveIconSetInternal(ctx, iconcatalog.FirstNonEmpty(+ explicitIcon,+ meta.ServiceIconSets[serviceName],+ meta.ProjectIcon,+ ))+}++func iconSetHasBothVariantsInternal(iconSet iconcatalog.IconSet) bool {+ return strings.TrimSpace(iconSet.Light) != "" && strings.TrimSpace(iconSet.Dark) != ""+}++func (s *ContainerService) getCachedProjectIconMetadataInternal(ctx context.Context, projectName string, metadataByProject map[string]projects.ArcaneComposeMetadata) projects.ArcaneComposeMetadata {+ if metadataByProject != nil {+ if meta, ok := metadataByProject[projectName]; ok {+ return meta+ }+ }++ if s.iconMetaCache != nil {+ if meta, ok := s.iconMetaCache.Get(projectName); ok {+ if metadataByProject != nil {+ metadataByProject[projectName] = meta+ }+ return meta+ }+ }++ meta := projects.ArcaneComposeMetadata{ServiceIconSets: map[string]projects.IconSet{}}+ proj, err := s.projectService.GetProjectByComposeName(ctx, projectName)+ if err == nil && proj != nil {+ meta = s.projectService.getProjectMetadataForProject(ctx, *proj)+ }+ if s.iconMetaCache != nil {+ s.iconMetaCache.Put(projectName, meta)+ }+ if metadataByProject != nil {+ metadataByProject[projectName] = meta+ }+ return meta+}++func (s *ContainerService) resolveIconSetInternal(ctx context.Context, iconSet iconcatalog.IconSet) iconcatalog.ResolvedIconSet {+ catalog := iconcatalog.DefaultCatalog+ if s != nil && s.settingsService != nil {+ catalog = s.settingsService.GetStringSetting(ctx, "iconCatalog", iconcatalog.DefaultCatalog)+ }+ return iconcatalog.Resolve(catalog, iconSet)+}+func (s *ContainerService) buildContainerPaginationConfig() pagination.Config[containertypes.Summary] {return pagination.Config[containertypes.Summary]{SearchAccessors: []pagination.SearchAccessor[containertypes.Summary]{diff --git a/backend/internal/services/dashboard_service.go b/backend/internal/services/dashboard_service.goindex 6212f33fe..7c7248128 100644--- a/backend/internal/services/dashboard_service.go+++ b/backend/internal/services/dashboard_service.go@@ -80,7 +80,7 @@ func (s *DashboardService) GetSnapshot(ctx context.Context, options DashboardActcontainerItems := make([]containertypes.Summary, 0, len(filteredContainers))currentContainerID, currentContainerErr := dockerutils.GetCurrentContainerID()if s.containerService != nil {- containerItems = s.containerService.buildContainerSummaries(filteredContainers, nil, currentContainerID, currentContainerErr)+ containerItems = s.containerService.buildContainerSummaries(ctx, filteredContainers, nil, currentContainerID, currentContainerErr)} else {for _, container := range filteredContainers {summary := containertypes.NewSummary(container)diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 3ebedaf77..70722ed8a 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -31,6 +31,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/projects""github.com/getarcaneapp/arcane/backend/pkg/utils""github.com/getarcaneapp/arcane/backend/pkg/utils/cache"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog""github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types""github.com/getarcaneapp/arcane/types/containerregistry"@@ -197,7 +198,8 @@ type ProjectServiceInfo struct {ContainerName string `json:"container_name"`Ports []string `json:"ports"`Health *string `json:"health,omitempty"`- IconURL string `json:"icon_url,omitempty"`+ IconLightURL string `json:"icon_light_url,omitempty"`+ IconDarkURL string `json:"icon_dark_url,omitempty"`ServiceConfig *composetypes.ServiceConfig `json:"service_config,omitempty"`Labels map[string]string `json:"labels,omitempty"`RedeployDisabled bool `json:"redeploy_disabled,omitempty"`@@ -945,6 +947,11 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinsvcConfig = &cfg}+ resolvedIcon := s.resolveIconSetInternal(ctx, iconcatalog.FirstNonEmpty(+ projects.FindArcaneIconSet(c.Labels),+ meta.ServiceIconSets[c.Service],+ meta.ProjectIcon,+ ))services = append(services, ProjectServiceInfo{Name: c.Service,Image: c.Image,@@ -953,7 +960,8 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinContainerName: c.Name,Ports: formatPorts(c.Publishers),Health: health,- IconURL: meta.ServiceIcons[c.Service],+ IconLightURL: resolvedIcon.IconLightURL,+ IconDarkURL: resolvedIcon.IconDarkURL,ServiceConfig: svcConfig,Labels: c.Labels,RedeployDisabled: libupdater.ShouldDisableArcaneServerRedeploy(c.Labels, c.ID, currentContainerID, currentContainerErr),@@ -963,12 +971,17 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinfor _, svc := range composeProject.Services {if !have[svc.Name] {+ resolvedIcon := s.resolveIconSetInternal(ctx, iconcatalog.FirstNonEmpty(+ meta.ServiceIconSets[svc.Name],+ meta.ProjectIcon,+ ))services = append(services, ProjectServiceInfo{Name: svc.Name,Image: svc.Image,Status: "stopped",Ports: []string{},- IconURL: meta.ServiceIcons[svc.Name],+ IconLightURL: resolvedIcon.IconLightURL,+ IconDarkURL: resolvedIcon.IconDarkURL,ServiceConfig: new(svc),})}@@ -1012,7 +1025,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.RelativePath = s.getProjectRelativePathInternal(projectsDir, proj.Path)resp.GitOpsManagedBy = proj.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, *proj)- resp.IconURL = meta.ProjectIconURL+ applyResolvedProjectIconInternal(&resp, s.resolveIconSetInternal(ctx, meta.ProjectIcon))resp.URLs = meta.ProjectURLS// Default counts/status from DB (will be overridden if runtime check succeeds)@@ -1091,7 +1104,8 @@ func buildProjectRuntimeServicesInternal(services []ProjectServiceInfo) []projecContainerName: svc.ContainerName,Ports: svc.Ports,Health: svc.Health,- IconURL: svc.IconURL,+ IconLightURL: svc.IconLightURL,+ IconDarkURL: svc.IconDarkURL,ServiceConfig: svc.ServiceConfig,RedeployDisabled: svc.RedeployDisabled,}@@ -3795,7 +3809,11 @@ func (s *ProjectService) appendDiscoveredComposeProjectUpdatesInternal(}knownProjectNames := s.buildKnownComposeProjectNameSetInternal(ctx, projectsArray)- discovered := buildDiscoveredComposeProjectUpdateRowsInternal(ctx, composeContainers, knownProjectNames, s.imageService)+ iconCatalog := iconcatalog.DefaultCatalog+ if s.settingsService != nil {+ iconCatalog = s.settingsService.GetStringSetting(ctx, "iconCatalog", iconcatalog.DefaultCatalog)+ }+ discovered := buildDiscoveredComposeProjectUpdateRowsInternal(ctx, composeContainers, knownProjectNames, s.imageService, iconCatalog)if len(discovered) == 0 {return items}@@ -3857,6 +3875,7 @@ func buildDiscoveredComposeProjectUpdateRowsInternal(composeContainers []container.Summary,knownProjectNames map[string]struct{},imageService *ImageService,+ iconCatalog string,) []project.Details {containersByProject := make(map[string][]container.Summary)for _, c := range composeContainers {@@ -3883,7 +3902,7 @@ func buildDiscoveredComposeProjectUpdateRowsInternal(updateInfoByRef := getRuntimeContainerUpdateInfoByRefInternal(ctx, composeContainers, imageService)rows := make([]project.Details, 0, len(containersByProject))for projectName, projectContainers := range containersByProject {- runtimeServices := buildDiscoveredRuntimeServicesInternal(projectContainers)+ runtimeServices := buildDiscoveredRuntimeServicesInternal(projectContainers, iconCatalog)imageRefs := projects.ImageRefsFromRuntimeServices(runtimeServices)updateInfo := buildProjectUpdateInfoSummaryInternal(imageRefs, updateInfoByRef)if updateInfo == nil || !updateInfo.HasUpdate {@@ -3988,7 +4007,7 @@ func getRuntimeContainerUpdateInfoByRefInternal(return updateInfoByRef}-func buildDiscoveredRuntimeServicesInternal(containers []container.Summary) []project.RuntimeService {+func buildDiscoveredRuntimeServicesInternal(containers []container.Summary, iconCatalog string) []project.RuntimeService {runtimeServices := make([]project.RuntimeService, 0, len(containers))seenServices := make(map[string]struct{}, len(containers))for _, c := range containers {@@ -4009,6 +4028,7 @@ func buildDiscoveredRuntimeServicesInternal(containers []container.Summary) []prcontainerName := dockerutil.ContainerNameFromNames(c.Names)+ resolvedIcon := iconcatalog.Resolve(iconCatalog, projects.FindArcaneIconSet(c.Labels))runtimeServices = append(runtimeServices, project.RuntimeService{Name: serviceName,Image: imageRef,@@ -4016,6 +4036,8 @@ func buildDiscoveredRuntimeServicesInternal(containers []container.Summary) []prContainerID: c.ID,ContainerName: containerName,Ports: formatDockerPorts(c.Ports),+ IconLightURL: resolvedIcon.IconLightURL,+ IconDarkURL: resolvedIcon.IconDarkURL,})}@@ -4186,7 +4208,7 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, proresults[i].RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)results[i].GitOpsManagedBy = p.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, p)- results[i].IconURL = meta.ProjectIconURL+ applyResolvedProjectIconInternal(&results[i], s.resolveIconSetInternal(ctx, meta.ProjectIcon))results[i].URLs = meta.ProjectURLSresults[i].Status = string(models.ProjectStatusUnknown)}@@ -4224,7 +4246,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringresp.RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)resp.GitOpsManagedBy = p.GitOpsManagedBymeta := s.getProjectMetadataForProject(ctx, p)- resp.IconURL = meta.ProjectIconURL+ applyResolvedProjectIconInternal(&resp, s.resolveIconSetInternal(ctx, meta.ProjectIcon))resp.URLs = meta.ProjectURLSprojectContainers := lookupProjectContainers(p, containersByProject)@@ -4255,6 +4277,11 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringresp.RedeployDisabled = true}+ resolvedIcon := s.resolveIconSetInternal(ctx, iconcatalog.FirstNonEmpty(+ projects.FindArcaneIconSet(c.Labels),+ meta.ServiceIconSets[svcName],+ meta.ProjectIcon,+ ))services = append(services, ProjectServiceInfo{Name: svcName,Image: c.Image,@@ -4263,6 +4290,8 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringContainerName: containerName,Ports: formatDockerPorts(c.Ports),Health: health,+ IconLightURL: resolvedIcon.IconLightURL,+ IconDarkURL: resolvedIcon.IconDarkURL,Labels: c.Labels,RedeployDisabled: redeployDisabled,})@@ -4283,6 +4312,8 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringContainerName: s.ContainerName,Ports: s.Ports,Health: s.Health,+ IconLightURL: s.IconLightURL,+ IconDarkURL: s.IconDarkURL,ServiceConfig: s.ServiceConfig,RedeployDisabled: s.RedeployDisabled,}@@ -4332,7 +4363,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringfunc (s *ProjectService) getProjectMetadataForProject(ctx context.Context, p models.Project) projects.ArcaneComposeMetadata {composeFile, err := s.resolveProjectComposeFileInternal(ctx, &p)if err != nil {- return projects.ArcaneComposeMetadata{ServiceIcons: map[string]string{}}+ return projects.ArcaneComposeMetadata{ServiceIconSets: map[string]projects.IconSet{}}}projectsDirectory, projectsDirErr := s.getProjectsDirectoryInternal(ctx)@@ -4344,12 +4375,28 @@ func (s *ProjectService) getProjectMetadataForProject(ctx context.Context, p modmeta, err := projects.ParseArcaneComposeMetadata(ctx, composeFile, projectsDirectory, autoInjectEnv)if err != nil {slog.WarnContext(ctx, "failed to parse Arcane compose metadata", "path", composeFile, "error", err)- return projects.ArcaneComposeMetadata{ServiceIcons: map[string]string{}}+ return projects.ArcaneComposeMetadata{ServiceIconSets: map[string]projects.IconSet{}}}return meta}+func (s *ProjectService) resolveIconSetInternal(ctx context.Context, iconSet iconcatalog.IconSet) iconcatalog.ResolvedIconSet {+ catalog := iconcatalog.DefaultCatalog+ if s != nil && s.settingsService != nil {+ catalog = s.settingsService.GetStringSetting(ctx, "iconCatalog", iconcatalog.DefaultCatalog)+ }+ return iconcatalog.Resolve(catalog, iconSet)+}++func applyResolvedProjectIconInternal(resp *project.Details, icon iconcatalog.ResolvedIconSet) {+ if resp == nil {+ return+ }+ resp.IconLightURL = icon.IconLightURL+ resp.IconDarkURL = icon.IconDarkURL+}+// End Table Functionsfunc (s *ProjectService) countServicesFromCompose(ctx context.Context, p models.Project) (int, error) {diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex 21a71904b..c14d51a6b 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -24,6 +24,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/config""github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog"buildtypes "github.com/getarcaneapp/arcane/types/builds""github.com/getarcaneapp/arcane/types/containerregistry"imagetypes "github.com/getarcaneapp/arcane/types/image"@@ -2679,7 +2680,7 @@ func TestBuildDiscoveredComposeProjectUpdateRowsInternal(t *testing.T) {State: "running",Labels: map[string]string{},},- }, map[string]struct{}{"known": {}}, imageService)+ }, map[string]struct{}{"known": {}}, imageService, iconcatalog.DefaultCatalog)require.Len(t, rows, 1)row := rows[0]@@ -2720,7 +2721,7 @@ func TestBuildDiscoveredComposeProjectUpdateRowsInternal_FallsBackToImageID(t *t"com.docker.compose.service": "web",},},- }, map[string]struct{}{}, imageService)+ }, map[string]struct{}{}, imageService, iconcatalog.DefaultCatalog)require.Len(t, rows, 1)assert.Equal(t, []string{"nginx:latest"}, rows[0].UpdateInfo.UpdatedImageRefs)@@ -3513,13 +3514,15 @@ services:image: nickfedor/watchtower:latest`), 0o600))- require.NoError(t, os.WriteFile(filepath.Join(projectPath, "metadata.yaml"), []byte(`x-watchtower-icon: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "metadata.yaml"), []byte(`x-watchtower-icon-light: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"x-arcane:- icon: *watchtower-icon+ icon-light: *watchtower-icon+ icon-dark: *watchtower-iconservices:watchtower:labels:- com.getarcaneapp.arcane.icon: *watchtower-icon+ com.getarcaneapp.arcane.icon-light: *watchtower-icon+ com.getarcaneapp.arcane.icon-dark: *watchtower-icon`), 0o600))require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))@@ -3534,7 +3537,8 @@ services:require.NoError(t, err)require.EqualValues(t, 1, page.TotalItems)require.Len(t, items, 1)- assert.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", items[0].IconURL)+ assert.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", items[0].IconLightURL)+ assert.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", items[0].IconDarkURL)}func TestProjectService_CountProjectFolders_RecursivelyCountsNestedProjects(t *testing.T) {diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 9496b00fb..fc6ce493c 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -182,6 +182,7 @@ func DefaultSettingsConfig() *models.Settings {SidebarHoverExpansion: models.SettingVariable{Value: "true"},KeyboardShortcutsEnabled: models.SettingVariable{Value: "true"},ApplicationTheme: models.SettingVariable{Value: "default"},+ IconCatalog: models.SettingVariable{Value: "selfhst"},AccentColor: models.SettingVariable{Value: "oklch(0.606 0.25 292.717)"},OledMode: models.SettingVariable{Value: "false"},MaxImageUploadSize: models.SettingVariable{Value: "500"},diff --git a/backend/pkg/projects/custom_labels.go b/backend/pkg/projects/custom_labels.goindex ec89c5c59..f92e67b74 100644--- a/backend/pkg/projects/custom_labels.go+++ b/backend/pkg/projects/custom_labels.go@@ -12,34 +12,43 @@ import ("github.com/compose-spec/compose-go/v2/loader"composetypes "github.com/compose-spec/compose-go/v2/types""github.com/getarcaneapp/arcane/backend/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/iconcatalog""github.com/goccy/go-yaml")const (- // ArcaneIconLabel is the full reverse-DNS label key for service-level icons.+ // ArcaneIconLabel is the full reverse-DNS label key for fallback service-level icons.ArcaneIconLabel = "com.getarcaneapp.arcane.icon"-- arcaneBlockKey = "x-arcane"- arcaneIconKey = "icon"- arcaneIconsKey = "icons"- arcaneURLsKey = "urls"+ // ArcaneIconLightLabel is the full reverse-DNS label key for light service-level icons.+ ArcaneIconLightLabel = "com.getarcaneapp.arcane.icon-light"+ // ArcaneIconDarkLabel is the full reverse-DNS label key for dark service-level icons.+ ArcaneIconDarkLabel = "com.getarcaneapp.arcane.icon-dark"++ arcaneBlockKey = "x-arcane"+ arcaneIconKey = "icon"+ arcaneIconsKey = "icons"+ arcaneIconLightKey = "icon-light"+ arcaneIconDarkKey = "icon-dark"+ arcaneURLsKey = "urls")+type IconSet = iconcatalog.IconSet+// ArcaneComposeMetadata represents Arcane-specific configuration extracted from a Compose file.type ArcaneComposeMetadata struct {- // ProjectIconURL is the URL to an icon representing the entire project.- ProjectIconURL string+ // ProjectIcon contains fallback, light, and dark icon values for the project.+ ProjectIcon IconSet// ProjectURLS are additional URLs related to the project (e.g., documentation, homepage).ProjectURLS []string- // ServiceIcons maps service names to their respective icon identifiers or URLs.- ServiceIcons map[string]string+ // ServiceIconSets maps service names to their fallback, light, and dark icon values.+ ServiceIconSets map[string]IconSet}// ParseArcaneComposeMetadata reads a Docker Compose file and extracts Arcane-specific metadata.// When projectsDirectory is set, Arcane's project env loading is used so .env.global is available.func ParseArcaneComposeMetadata(ctx context.Context, composeFilePath, projectsDirectory string, autoInjectEnv bool) (ArcaneComposeMetadata, error) {if composeFilePath == "" {- return ArcaneComposeMetadata{ServiceIcons: map[string]string{}}, nil+ return emptyArcaneComposeMetadataInternal(), nil}workdir := filepath.Dir(composeFilePath)@@ -51,7 +60,7 @@ func ParseArcaneComposeMetadata(ctx context.Context, composeFilePath, projectsDienvLoader := NewEnvLoader(projectsDirectory, workdir, autoInjectEnv)envMap, _, err := envLoader.LoadEnvironment(ctx)if err != nil {- return ArcaneComposeMetadata{ServiceIcons: map[string]string{}}, fmt.Errorf("load project environment: %w", err)+ return emptyArcaneComposeMetadataInternal(), fmt.Errorf("load project environment: %w", err)}return ParseArcaneComposeMetadataWithEnv(ctx, composeFilePath, envMap)@@ -63,7 +72,7 @@ func ParseArcaneComposeMetadataWithEnv(ctx context.Context, composeFilePath stri}func parseArcaneComposeMetadataFromFileInternal(ctx context.Context, composeFilePath string, envMap map[string]string, visited map[string]struct{}) (ArcaneComposeMetadata, error) {- meta := ArcaneComposeMetadata{ServiceIcons: map[string]string{}}+ meta := emptyArcaneComposeMetadataInternal()if composeFilePath == "" {return meta, nil}@@ -112,39 +121,43 @@ func parseArcaneComposeMetadataFromFileInternal(ctx context.Context, composeFile}func extractArcaneComposeMetadata(project *composetypes.Project) ArcaneComposeMetadata {- meta := ArcaneComposeMetadata{ServiceIcons: map[string]string{}}+ meta := emptyArcaneComposeMetadataInternal()if project == nil {return meta}if arcaneBlock, ok := project.Extensions[arcaneBlockKey]; ok {- meta.ProjectIconURL, meta.ProjectURLS = parseArcaneBlock(arcaneBlock)+ meta.ProjectIcon, meta.ProjectURLS = parseArcaneBlockInternal(arcaneBlock)}for name, svc := range project.Services {- icon := findArcaneIconLabel(svc.Labels)- if icon == "" && svc.Deploy != nil {- icon = findArcaneIconLabel(svc.Deploy.Labels)+ iconSet := FindArcaneIconSet(svc.Labels)+ if iconSet.IsEmpty() && svc.Deploy != nil {+ iconSet = FindArcaneIconSet(svc.Deploy.Labels)}- if icon == "" {+ if iconSet.IsEmpty() {if arcaneBlock, ok := svc.Extensions[arcaneBlockKey]; ok {- icon, _ = parseArcaneBlock(arcaneBlock)+ iconSet, _ = parseArcaneBlockInternal(arcaneBlock)}}- if icon != "" {- meta.ServiceIcons[name] = icon+ if !iconSet.IsEmpty() {+ meta.ServiceIconSets[name] = iconSet}}return meta}-func parseArcaneBlock(block any) (string, []string) {+func parseArcaneBlockInternal(block any) (IconSet, []string) {arcaneBlock, ok := utils.AsStringMap(block)if !ok {- return "", nil+ return IconSet{}, nil+ }+ icon := IconSet{+ Icon: utils.FirstNonEmpty(getFirstString(arcaneBlock[arcaneIconKey]), getFirstString(arcaneBlock[arcaneIconsKey])),+ Light: getFirstString(arcaneBlock[arcaneIconLightKey]),+ Dark: getFirstString(arcaneBlock[arcaneIconDarkKey]),}- icon := utils.FirstNonEmpty(getFirstString(arcaneBlock[arcaneIconKey]), getFirstString(arcaneBlock[arcaneIconsKey]))urls := utils.UniqueNonEmptyStrings(utils.Collect(arcaneBlock[arcaneURLsKey], utils.ToString))return icon, urls}@@ -154,19 +167,34 @@ func mergeArcaneComposeMetadata(target *ArcaneComposeMetadata, source ArcaneCompreturn}- if target.ProjectIconURL == "" {- target.ProjectIconURL = source.ProjectIconURL- }+ target.ProjectIcon = mergeIconSetFieldsInternal(target.ProjectIcon, source.ProjectIcon)target.ProjectURLS = utils.UniqueNonEmptyStrings(append(target.ProjectURLS, source.ProjectURLS...))- if target.ServiceIcons == nil {- target.ServiceIcons = map[string]string{}+ if target.ServiceIconSets == nil {+ target.ServiceIconSets = map[string]IconSet{}}- for name, icon := range source.ServiceIcons {- if _, exists := target.ServiceIcons[name]; !exists {- target.ServiceIcons[name] = icon- }+ for name, iconSet := range source.ServiceIconSets {+ target.ServiceIconSets[name] = mergeIconSetFieldsInternal(target.ServiceIconSets[name], iconSet)+ }+}++func mergeIconSetFieldsInternal(target, source IconSet) IconSet {+ if strings.TrimSpace(target.Icon) == "" {+ target.Icon = source.Icon+ }+ if strings.TrimSpace(target.Light) == "" {+ target.Light = source.Light+ }+ if strings.TrimSpace(target.Dark) == "" {+ target.Dark = source.Dark+ }+ return target+}++func emptyArcaneComposeMetadataInternal() ArcaneComposeMetadata {+ return ArcaneComposeMetadata{+ ServiceIconSets: map[string]IconSet{},}}@@ -319,24 +347,53 @@ func getFirstString(v any) string {return ""}-// findArcaneIconLabel attempts to locate an Arcane icon label within service labels.+// FindArcaneIconSet attempts to locate Arcane icon labels within service labels.// It supports both map[string]string and []string label formats.-func findArcaneIconLabel(labels any) string {+func FindArcaneIconSet(labels any) IconSet {+ iconSet := IconSet{}if labelMap, ok := utils.AsStringMap(labels); ok {for key, value := range labelMap {- if isArcaneIconLabel(key) {- return utils.ToString(value)- }+ assignArcaneIconValueInternal(&iconSet, key, utils.ToString(value))}+ return iconSet}for _, s := range utils.Collect(labels, utils.ToString) {- if key, value, ok := parseLabelPair(s); ok && isArcaneIconLabel(key) {- return value+ if key, value, ok := parseLabelPair(s); ok {+ assignArcaneIconValueInternal(&iconSet, key, value)}}- return ""+ return iconSet+}++func assignArcaneIconValueInternal(iconSet *IconSet, key string, value string) {+ if iconSet == nil {+ return+ }++ switch normalizeArcaneIconLabelInternal(key) {+ case "icon":+ iconSet.Icon = value+ case "icon-light":+ iconSet.Light = value+ case "icon-dark":+ iconSet.Dark = value+ }+}++func normalizeArcaneIconLabelInternal(key string) string {+ normalized := strings.ToLower(strings.TrimSpace(key))+ switch normalized {+ case ArcaneIconLabel, "arcane.icon":+ return "icon"+ case ArcaneIconLightLabel, "arcane.icon-light":+ return "icon-light"+ case ArcaneIconDarkLabel, "arcane.icon-dark":+ return "icon-dark"+ default:+ return ""+ }}// parseLabelPair parses a "KEY=VALUE" string into its components.@@ -347,8 +404,3 @@ func parseLabelPair(raw string) (string, string, bool) {}return strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1]), true}--// isArcaneIconLabel checks if a label key matches the Arcane icon label definition.-func isArcaneIconLabel(key string) bool {- return strings.ToLower(strings.TrimSpace(key)) == ArcaneIconLabel-}diff --git a/backend/pkg/projects/custom_labels_test.go b/backend/pkg/projects/custom_labels_test.goindex 524c38ea8..0f271d752 100644--- a/backend/pkg/projects/custom_labels_test.go+++ b/backend/pkg/projects/custom_labels_test.go@@ -18,9 +18,10 @@ func TestParseArcaneComposeMetadata_InterpolationAndAnchor(t *testing.T) {composeContent := `services:app:image: nginx:alpine-x-arcane-icon: &arcane-icon "${ARCANE_TEST_ICONS_CDN}/webp/raspberry-pi.webp"+x-arcane-icon-light: &arcane-icon "${ARCANE_TEST_ICONS_CDN}/webp/raspberry-pi.webp"x-arcane:- icon: *arcane-icon+ icon-light: *arcane-icon+ icon-dark: *arcane-iconurls:- https://www.${ARCANE_TEST_DOMAIN}`@@ -30,7 +31,8 @@ x-arcane:meta, err := ParseArcaneComposeMetadata(context.Background(), composePath, tempDir, false)require.NoError(t, err)- require.Equal(t, "https://cdn.jsdelivr.net/gh/homarr-labs/webp/raspberry-pi.webp", meta.ProjectIconURL)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/homarr-labs/webp/raspberry-pi.webp", meta.ProjectIcon.Light)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/homarr-labs/webp/raspberry-pi.webp", meta.ProjectIcon.Dark)require.Equal(t, []string{"https://www.example.com"}, meta.ProjectURLS)}@@ -47,7 +49,8 @@ services:require.NoError(t, os.WriteFile(composePath, []byte(composeContent), 0o600))metaContent := `x-arcane:- icon: https://example.com/icon.png+ icon-light: https://example.com/icon-light.png+ icon-dark: https://example.com/icon-dark.pngurls:- https://example.com/docs`@@ -55,7 +58,8 @@ services:meta, err := ParseArcaneComposeMetadata(context.Background(), composePath, tempDir, false)require.NoError(t, err)- require.Equal(t, "https://example.com/icon.png", meta.ProjectIconURL)+ require.Equal(t, "https://example.com/icon-light.png", meta.ProjectIcon.Light)+ require.Equal(t, "https://example.com/icon-dark.png", meta.ProjectIcon.Dark)require.Equal(t, []string{"https://example.com/docs"}, meta.ProjectURLS)}@@ -77,14 +81,16 @@ services:image: nickfedor/watchtower:latest`), 0o600))- require.NoError(t, os.WriteFile(filepath.Join(projectDir, "metadata.yaml"), []byte(`x-watchtower-icon: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"+ require.NoError(t, os.WriteFile(filepath.Join(projectDir, "metadata.yaml"), []byte(`x-watchtower-icon-light: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"x-arcane:- icon: *watchtower-icon+ icon-light: *watchtower-icon+ icon-dark: *watchtower-icon`), 0o600))meta, err := ParseArcaneComposeMetadata(context.Background(), filepath.Join(projectDir, "compose.yaml"), projectsRoot, false)require.NoError(t, err)- require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIconURL)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIcon.Light)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIcon.Dark)}func TestParseArcaneComposeMetadata_LoadsGlobalEnvForNestedProjects(t *testing.T) {@@ -105,12 +111,14 @@ services:image: nickfedor/watchtower:latest`), 0o600))- require.NoError(t, os.WriteFile(filepath.Join(projectDir, "metadata.yaml"), []byte(`x-watchtower-icon: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"+ require.NoError(t, os.WriteFile(filepath.Join(projectDir, "metadata.yaml"), []byte(`x-watchtower-icon-light: &watchtower-icon "${ICON_CDN_URL:+${ICON_CDN_URL}/svg/watchtower.svg}"x-arcane:- icon: *watchtower-icon+ icon-light: *watchtower-icon+ icon-dark: *watchtower-icon`), 0o600))meta, err := ParseArcaneComposeMetadata(context.Background(), filepath.Join(projectDir, "compose.yaml"), projectsRoot, false)require.NoError(t, err)- require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIconURL)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIcon.Light)+ require.Equal(t, "https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/watchtower.svg", meta.ProjectIcon.Dark)}diff --git a/backend/pkg/utils/iconcatalog/iconcatalog.go b/backend/pkg/utils/iconcatalog/iconcatalog.gonew file mode 100644index 000000000..07804a8fd--- /dev/null+++ b/backend/pkg/utils/iconcatalog/iconcatalog.go@@ -0,0 +1,131 @@+// Package iconcatalog resolves Arcane icon metadata into catalog URLs.+package iconcatalog++import (+ "fmt"+ "net/url"+ "strings"+)++const (+ CatalogSelfhst = "selfhst"+ CatalogDashboardIcons = "dashboard-icons"+ DefaultCatalog = CatalogSelfhst+)++type IconSet struct {+ Icon string+ Light string+ Dark string+}++type ResolvedIconSet struct {+ IconLightURL string+ IconDarkURL string+}++func (s IconSet) IsEmpty() bool {+ return strings.TrimSpace(s.Icon) == "" &&+ strings.TrimSpace(s.Light) == "" &&+ strings.TrimSpace(s.Dark) == ""+}++func (s IconSet) HasVariant() bool {+ return strings.TrimSpace(s.Light) != "" || strings.TrimSpace(s.Dark) != ""+}++func FirstNonEmpty(sets ...IconSet) IconSet {+ merged := IconSet{}+ fallback := ""++ for _, set := range sets {+ if fallback == "" {+ fallback = strings.TrimSpace(set.Icon)+ }+ if merged.Light == "" {+ merged.Light = strings.TrimSpace(set.Light)+ }+ if merged.Dark == "" {+ merged.Dark = strings.TrimSpace(set.Dark)+ }+ }++ if strings.TrimSpace(merged.Light) != "" || strings.TrimSpace(merged.Dark) != "" {+ if fallback != "" {+ if merged.Light == "" {+ merged.Light = fallback+ }+ if merged.Dark == "" {+ merged.Dark = fallback+ }+ }+ return merged+ }+ if fallback != "" {+ return IconSet{Icon: fallback}+ }+ return IconSet{}+}++func Resolve(catalog string, set IconSet) ResolvedIconSet {+ selectedCatalog := normalizeCatalogInternal(catalog)+ if strings.TrimSpace(set.Light) == "" && strings.TrimSpace(set.Dark) == "" {+ generic := resolveValueInternal(selectedCatalog, set.Icon, "")+ return ResolvedIconSet{+ IconLightURL: generic,+ IconDarkURL: generic,+ }+ }++ light := strings.TrimSpace(set.Light)+ if light == "" {+ light = strings.TrimSpace(set.Icon)+ }+ dark := strings.TrimSpace(set.Dark)+ if dark == "" {+ dark = strings.TrimSpace(set.Icon)+ }++ return ResolvedIconSet{+ IconLightURL: resolveValueInternal(selectedCatalog, light, "light"),+ IconDarkURL: resolveValueInternal(selectedCatalog, dark, "dark"),+ }+}++func normalizeCatalogInternal(catalog string) string {+ switch strings.ToLower(strings.TrimSpace(catalog)) {+ case CatalogDashboardIcons:+ return CatalogDashboardIcons+ default:+ return DefaultCatalog+ }+}++func resolveValueInternal(catalog, raw, variant string) string {+ value := strings.TrimSpace(raw)+ if value == "" || strings.HasPrefix(strings.ToLower(value), "data:") {+ return ""+ }+ if isAbsoluteHTTPURLInternal(value) {+ return value+ }++ slug := url.PathEscape(value)+ switch catalog {+ case CatalogDashboardIcons:+ return fmt.Sprintf("https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/%s.svg", slug)+ default:+ if variant != "" {+ slug += "-" + variant+ }+ return fmt.Sprintf("https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/%s.svg", slug)+ }+}++func isAbsoluteHTTPURLInternal(raw string) bool {+ u, err := url.Parse(raw)+ if err != nil {+ return false+ }+ return u.IsAbs() && (u.Scheme == "http" || u.Scheme == "https")+}diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex bc73bb54b..6dd71bd78 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -22,6 +22,12 @@"application_theme_everforest_description": "Muted green-brown surfaces inspired by Everforest.","application_theme_rosepine": "Rosé Pine","application_theme_rosepine_description": "Soft mauve and sand surfaces inspired by Rosé Pine.",+ "icon_catalog": "Icon Catalog",+ "icon_catalog_description": "Choose which catalog resolves project and container icon slugs.",+ "icon_catalog_selfhst": "selfh.st",+ "icon_catalog_selfhst_description": "Use the selfh.st icon catalog.",+ "icon_catalog_dashboard_icons": "Dashboard Icons",+ "icon_catalog_dashboard_icons_description": "Use the Homarr Dashboard Icons catalog.","custom_accent_color": "Custom Accent Color","custom_accent_color_description": "Enter a custom color using valid CSS color formats (e.g., hex, rgb, hsl).","color_value": "Color value",diff --git a/frontend/src/lib/components/code-editor/analysis/compose-schema.ts b/frontend/src/lib/components/code-editor/analysis/compose-schema.tsindex 0282cd27a..fe786473d 100644--- a/frontend/src/lib/components/code-editor/analysis/compose-schema.ts+++ b/frontend/src/lib/components/code-editor/analysis/compose-schema.ts@@ -30,25 +30,25 @@ const ARCANE_ROOT_EXTENSION_COMPLETIONS: ArcaneCompletionSpec[] = [{label: 'x-arcane',detail: 'Arcane extension',- info: 'Arcane compose metadata block for project-level icon and URLs.'- },- {- label: 'x-arcane-icon',- detail: 'Arcane extension helper',- info: 'Optional extension key often used for YAML anchors/reuse of icon values.'+ info: 'Arcane compose metadata block for project-level theme icons and URLs.'}];const ARCANE_BLOCK_COMPLETIONS: ArcaneCompletionSpec[] = [{label: 'icon',- detail: 'Arcane project icon',- info: 'Project icon URL or icon identifier.'+ detail: 'Arcane project fallback icon',+ info: 'Fallback project icon URL or catalog slug used only when icon-light and icon-dark are not set.'},{- label: 'icons',- detail: 'Arcane project icon (alias)',- info: 'Alias for icon metadata; first non-empty value is used.'+ label: 'icon-light',+ detail: 'Arcane project icon for dark theme',+ info: 'Light project icon URL or catalog slug used in dark theme.'+ },+ {+ label: 'icon-dark',+ detail: 'Arcane project icon for light theme',+ info: 'Dark project icon URL or catalog slug used in light theme.'},{label: 'urls',@@ -61,20 +61,25 @@ const ARCANE_SERVICE_EXTENSION_COMPLETIONS: ArcaneCompletionSpec[] = [{label: 'x-arcane',detail: 'Arcane service extension',- info: 'Arcane service metadata block for service icon overrides.'+ info: 'Arcane service metadata block for service theme icon overrides.'}];const ARCANE_SERVICE_BLOCK_COMPLETIONS: ArcaneCompletionSpec[] = [{label: 'icon',- detail: 'Arcane service icon',- info: 'Service icon URL or icon identifier.'+ detail: 'Arcane service fallback icon',+ info: 'Fallback service icon URL or catalog slug used only when icon-light and icon-dark are not set.'+ },+ {+ label: 'icon-light',+ detail: 'Arcane service icon for dark theme',+ info: 'Light service icon URL or catalog slug used in dark theme.'},{- label: 'icons',- detail: 'Arcane service icon (alias)',- info: 'Alias for service icon metadata; first non-empty value is used.'+ label: 'icon-dark',+ detail: 'Arcane service icon for light theme',+ info: 'Dark service icon URL or catalog slug used in light theme.'}];@@ -313,28 +318,28 @@ function getArcaneSchemaDocForPath(path: Array<string | number>): SchemaDoc | nuif (path.length === 1 && path[0] === 'x-arcane') {return {title: 'x-arcane',- description: 'Arcane extension block for project-level metadata such as icon and custom URLs.'+ description: 'Arcane extension block for project-level metadata such as theme icons and custom URLs.'};}- if (path.length === 1 && path[0] === 'x-arcane-icon') {+ if (path.length === 2 && path[0] === 'x-arcane' && path[1] === 'icon-light') {return {- title: 'x-arcane-icon',- description: 'Optional Arcane helper extension key, commonly used as a YAML anchor value for icon reuse.'+ title: 'x-arcane.icon-light',+ description: 'Light project icon URL or catalog slug used in dark theme.'};}- if (path.length === 2 && path[0] === 'x-arcane' && path[1] === 'icon') {+ if (path.length === 2 && path[0] === 'x-arcane' && path[1] === 'icon-dark') {return {- title: 'x-arcane.icon',- description: 'Project icon URL or icon identifier used for the stack/project display.'+ title: 'x-arcane.icon-dark',+ description: 'Dark project icon URL or catalog slug used in light theme.'};}- if (path.length === 2 && path[0] === 'x-arcane' && path[1] === 'icons') {+ if (path.length === 2 && path[0] === 'x-arcane' && path[1] === 'icon') {return {- title: 'x-arcane.icons',- description: 'Alias for icon metadata. Arcane uses the first non-empty value between icon/icons.'+ title: 'x-arcane.icon',+ description: 'Fallback project icon URL or catalog slug used only when icon-light and icon-dark are not set.'};}@@ -357,11 +362,14 @@ function getArcaneSchemaDocForPath(path: Array<string | number>): SchemaDoc | nupath[0] === 'services' &&typeof path[1] === 'string' &&path[2] === 'x-arcane' &&- (path[3] === 'icon' || path[3] === 'icons')+ (path[3] === 'icon' || path[3] === 'icon-light' || path[3] === 'icon-dark')) {return {title: `services.<name>.x-arcane.${String(path[3])}`,- description: 'Service icon URL or icon identifier override.'+ description:+ path[3] === 'icon'+ ? 'Fallback service icon URL or catalog slug used only when icon-light and icon-dark are not set.'+ : 'Service theme icon URL or catalog slug override.'};}diff --git a/frontend/src/lib/types/docker.ts b/frontend/src/lib/types/docker.tsindex 60642bda0..abfde38e8 100644--- a/frontend/src/lib/types/docker.ts+++ b/frontend/src/lib/types/docker.ts@@ -12,6 +12,8 @@ export interface BaseContainer {labels: Record<string, string>;state: string;status: string;+ iconLightUrl?: string;+ iconDarkUrl?: string;}export interface PortBinding {@@ -195,6 +197,8 @@ export interface ContainerDetailsDto {mounts: ContainerMounts[];labels: Record<string, string>;composeInfo?: ComposeInfo;+ iconLightUrl?: string;+ iconDarkUrl?: string;redeployDisabled?: boolean;}diff --git a/frontend/src/lib/types/settings.ts b/frontend/src/lib/types/settings.tsindex 8ab407b44..e58ab6fb9 100644--- a/frontend/src/lib/types/settings.ts+++ b/frontend/src/lib/types/settings.ts@@ -3,6 +3,7 @@ import type { TemplateRegistryConfig } from './swarm';// --- Application settings ---export type ApplicationTheme = 'default' | 'graphite' | 'ocean' | 'amber' | 'github' | 'nord' | 'everforest' | 'rosepine';+export type IconCatalog = 'selfhst' | 'dashboard-icons';export type Settings = {projectsDirectory: string;@@ -53,6 +54,7 @@ export type Settings = {defaultShell: string;dockerHost: string;applicationTheme: ApplicationTheme;+ iconCatalog: IconCatalog;accentColor: string;oledMode: boolean;autoInjectEnv: boolean;diff --git a/frontend/src/lib/types/swarm.ts b/frontend/src/lib/types/swarm.tsindex 6a042093a..952c71722 100644--- a/frontend/src/lib/types/swarm.ts+++ b/frontend/src/lib/types/swarm.ts@@ -496,7 +496,8 @@ export interface RuntimeService {containerName?: string;ports?: string[];health?: string;- iconUrl?: string;+ iconLightUrl?: string;+ iconDarkUrl?: string;serviceConfig?: ProjectService;redeployDisabled?: boolean;}@@ -520,7 +521,8 @@ export interface Project {dirName?: string;relativePath?: string;path: string;- iconUrl?: string;+ iconLightUrl?: string;+ iconDarkUrl?: string;urls?: string[];runningCount: string;serviceCount: string;diff --git a/frontend/src/lib/utils/docker.ts b/frontend/src/lib/utils/docker.tsindex 3ded073a3..5dfade79e 100644--- a/frontend/src/lib/utils/docker.ts+++ b/frontend/src/lib/utils/docker.ts@@ -454,22 +454,17 @@ export function startVulnerabilityScanPolling(};}-// --- Arcane icon label extraction -----const ARCANE_ICON_LABELS = ['arcane.icon', 'com.getarcaneapp.arcane.icon'];--export function getArcaneIconUrlFromLabels(labels?: Record<string, string> | null): string | null {- if (!labels) return null;+export type ThemedIconSource = {+ iconLightUrl?: string | null;+ iconDarkUrl?: string | null;+};- for (const [key, value] of Object.entries(labels)) {- const normalizedKey = key.trim().toLowerCase();- if (ARCANE_ICON_LABELS.includes(normalizedKey)) {- const trimmed = value?.trim();- if (trimmed) return trimmed;- }+export function getThemedIconUrl(source?: ThemedIconSource | null, themeMode?: string | null): string | null {+ if (!source) return null;+ if (themeMode === 'light') {+ return source.iconDarkUrl?.trim() || null;}-- return null;+ return source.iconLightUrl?.trim() || null;}// --- App image URLs ---diff --git a/frontend/src/lib/utils/settings.ts b/frontend/src/lib/utils/settings.tsindex 49bb7f18c..caa31dfdc 100644--- a/frontend/src/lib/utils/settings.ts+++ b/frontend/src/lib/utils/settings.ts@@ -1,11 +1,13 @@import { get, writable } from 'svelte/store';import { z } from 'zod/v4';import type { ApplicationTheme } from '$lib/types/settings';+import type { IconCatalog } from '$lib/types/settings';// --- Local vs environment settings classification ---export type LocalSettings = {applicationTheme: ApplicationTheme;+ iconCatalog: IconCatalog;accentColor: string;oledMode: boolean;mobileNavigationMode: string;@@ -17,6 +19,7 @@ export type LocalSettings = {const LOCAL_SETTING_KEYS = new Set(['applicationTheme',+ 'iconCatalog','accentColor','oledMode','mobileNavigationMode',diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelteindex 9fd2c3dfe..1e155758b 100644--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte@@ -23,8 +23,8 @@import ContainerDetailStatsSync from '../components/container-detail-stats-sync.svelte';import ContainerHealthcheck from '../components/ContainerHealthcheck.svelte';import IconImage from '$lib/components/icon-image.svelte';- import { getArcaneIconUrlFromLabels } from '$lib/utils/docker';- import { calculateMemoryUsage } from '$lib/utils/docker';+ import { calculateMemoryUsage, getThemedIconUrl } from '$lib/utils/docker';+ import { mode } from 'mode-watcher';import {ArrowLeftIcon,AlertIcon,@@ -80,7 +80,7 @@};const containerDisplayName = $derived(cleanContainerName(container?.name));- const containerIconUrl = $derived(getArcaneIconUrlFromLabels(container?.labels));+ const containerIconUrl = $derived(getThemedIconUrl(container, mode.current));const calculateCPUPercent = (statsData: ContainerStatsType | null): number => {if (!statsData || !statsData.cpu_stats || !statsData.precpu_stats) {diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelteindex b086c732b..7fadf9ba4 100644--- a/frontend/src/routes/(app)/containers/container-table.svelte+++ b/frontend/src/routes/(app)/containers/container-table.svelte@@ -22,13 +22,14 @@import ImageUpdateItem from '$lib/components/image-update-item.svelte';import { PersistedState } from 'runed';import { onMount } from 'svelte';+ import { mode } from 'mode-watcher';import { ContainerStatsManager } from './components/container-stats-manager.svelte';import ContainerStatsSync from './components/container-stats-sync.svelte';import ContainerStatsCell from './components/container-stats-cell.svelte';import { environmentStore } from '$lib/stores/environment.store.svelte';import { hasPermission } from '$lib/utils/auth';import IconImage from '$lib/components/icon-image.svelte';- import { getArcaneIconUrlFromLabels, getContainerIpAddresses } from '$lib/utils/docker';+ import { getContainerIpAddresses, getThemedIconUrl } from '$lib/utils/docker';import { hasAnyLoadingState } from '$lib/utils/bulk-actions';import { createContainerActions } from './container-table.actions';import {@@ -373,7 +374,7 @@{#snippet NameCell({ item }: { item: ContainerSummaryDto })}{@const displayName = getContainerDisplayName(item)}- {@const iconUrl = getArcaneIconUrlFromLabels(item.labels)}+ {@const iconUrl = getThemedIconUrl(item, mode.current)}<div class="flex items-center gap-2"><IconImage src={iconUrl} alt={displayName} fallback={BoxIcon} class="size-4" containerClass="size-7" /><a class="font-medium hover:underline" href="/containers/{item.id}">{displayName}</a>@@ -478,7 +479,7 @@<UniversalMobileCard{item}icon={(item) => {- const iconUrl = getArcaneIconUrlFromLabels(item.labels);+ const iconUrl = getThemedIconUrl(item, mode.current);const state = item.state;return {component: BoxIcon,diff --git a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte b/frontend/src/routes/(app)/dashboard/dash-container-table.svelteindex b7c57b7a7..ae614e52b 100644--- a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte+++ b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte@@ -12,10 +12,11 @@import { m } from '$lib/paraglide/messages';import { containerService } from '$lib/services/container-service';import { goto } from '$app/navigation';+ import { mode } from 'mode-watcher';import { useResponsiveTableLimit } from '$lib/hooks/use-responsive-table-limit.svelte';import { ContainersIcon, ArrowRightIcon } from '$lib/icons';import IconImage from '$lib/components/icon-image.svelte';- import { getArcaneIconUrlFromLabels } from '$lib/utils/docker';+ import { getThemedIconUrl } from '$lib/utils/docker';let {containers = $bindable(),@@ -50,7 +51,7 @@{#snippet NameCell({ item }: { item: ContainerSummaryDto })}{@const firstName = item.names?.[0] ?? ''}{@const displayName = firstName ? (firstName.startsWith('/') ? firstName.substring(1) : firstName) : item.id.substring(0, 12)}- {@const iconUrl = getArcaneIconUrlFromLabels(item.labels)}+ {@const iconUrl = getThemedIconUrl(item, mode.current)}<div class="flex items-center gap-2"><IconImage src={iconUrl} alt={displayName} fallback={ContainersIcon} class="size-4" containerClass="size-7" /><a class="font-medium hover:underline" href="/containers/{item.id}">{displayName}</a>@@ -65,7 +66,7 @@<UniversalMobileCard{item}icon={(item) => {- const iconUrl = getArcaneIconUrlFromLabels(item.labels);+ const iconUrl = getThemedIconUrl(item, mode.current);const state = item.state;return {component: ContainersIcon,diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelteindex 4dad18673..7776af4bd 100644--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte@@ -10,10 +10,11 @@import TabbedPageLayout from '$lib/layouts/tabbed-page-layout.svelte';import ActionButtons from '$lib/components/action-buttons.svelte';import StatusBadge from '$lib/components/badges/status-badge.svelte';- import { getStatusVariant } from '$lib/utils/docker';+ import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';import { capitalizeFirstLetter } from '$lib/utils/formatting';import { page } from '$app/state';import { invalidateAll } from '$app/navigation';+ import { mode } from 'mode-watcher';import { toast } from 'svelte-sonner';import { tryCatch } from '$lib/utils/api';import { handleApiResultWithCallbacks } from '$lib/utils/api';@@ -674,7 +675,7 @@{#snippet headerInfo()}<div class="flex min-w-0 items-start gap-3"><IconImage- src={project.iconUrl}+ src={getThemedIconUrl(project, mode.current)}alt={project.name}fallback={ProjectsIcon}class="size-6"diff --git a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelteindex d37a73876..37e5c6ed3 100644--- a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte+++ b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte@@ -7,7 +7,7 @@import StatusBadge from '$lib/components/badges/status-badge.svelte';import { PortBadge } from '$lib/components/badges/index.js';import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';- import { getStatusVariant } from '$lib/utils/docker';+ import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';import { capitalizeFirstLetter } from '$lib/utils/formatting';import type { RuntimeService } from '$lib/types/swarm';import type { ColumnSpec, BulkAction } from '$lib/components/arcane-table';@@ -18,7 +18,7 @@import { hasPermission } from '$lib/utils/auth';import * as ArcaneTooltip from '$lib/components/arcane-tooltip';import IconImage from '$lib/components/icon-image.svelte';- import { getArcaneIconUrlFromLabels } from '$lib/utils/docker';+ import { mode } from 'mode-watcher';import { bulkConfirmAndRun, hasAnyLoadingState } from '$lib/utils/bulk-actions';import { confirmAndRemoveContainer, runContainerLifecycleAction } from '$lib/utils/container-actions';import {@@ -263,7 +263,7 @@{#snippet NameCell({ item }: { item: ServiceWithId })}{@const displayName = item.containerName || item.name}- {@const iconUrl = item.iconUrl ?? getArcaneIconUrlFromLabels(item.serviceConfig?.labels)}+ {@const iconUrl = getThemedIconUrl(item, mode.current)}<div class="flex items-center gap-2"><IconImage src={iconUrl} alt={displayName} fallback={BoxIcon} class="size-4" containerClass="size-7" />{#if item.containerId}@@ -336,7 +336,7 @@<UniversalMobileCard{item}icon={(item) => {- const iconUrl = item.iconUrl ?? getArcaneIconUrlFromLabels(item.serviceConfig?.labels);+ const iconUrl = getThemedIconUrl(item, mode.current);return {component: BoxIcon,variant: item.status === 'running' ? 'emerald' : item.status === 'exited' ? 'red' : 'amber',diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelteindex a3c57493c..3d6c35ef6 100644--- a/frontend/src/routes/(app)/projects/projects-table.svelte+++ b/frontend/src/routes/(app)/projects/projects-table.svelte@@ -6,10 +6,11 @@import { BoxIcon, EditIcon, StartIcon, RestartIcon, StopIcon, TrashIcon, RedeployIcon, EllipsisIcon } from '$lib/icons';import { Spinner } from '$lib/components/ui/spinner/index.js';import { goto } from '$app/navigation';+ import { mode } from 'mode-watcher';import { toast } from 'svelte-sonner';import StatusBadge from '$lib/components/badges/status-badge.svelte';import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';- import { getStatusVariant } from '$lib/utils/docker';+ import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';import { capitalizeFirstLetter } from '$lib/utils/formatting';import { format } from 'date-fns';import type { ColumnSpec, MobileFieldVisibility, BulkAction } from '$lib/components/arcane-table';@@ -228,7 +229,13 @@{#snippet NameCell({ item }: { item: Project })}<div class="flex items-center gap-2">- <IconImage src={item.iconUrl} alt={item.name} fallback={FolderOpenIcon} class="size-8" containerClass="size-10" />+ <IconImage+ src={getThemedIconUrl(item, mode.current)}+ alt={item.name}+ fallback={FolderOpenIcon}+ class="size-8"+ containerClass="size-10"+ /><a class="font-medium hover:underline" href="/projects/{item.id}">{item.name}</a>{#if item.isArchived}<span class="bg-muted text-muted-foreground rounded px-1.5 py-0.5 text-xs font-medium">{m.projects_archived_badge()}</span>@@ -296,7 +303,7 @@icon={(item: Project) => ({component: FolderOpenIcon,variant: item.status === 'running' ? 'emerald' : item.status === 'exited' ? 'red' : 'amber',- imageUrl: item.iconUrl,+ imageUrl: getThemedIconUrl(item, mode.current) ?? undefined,alt: item.name})}title={(item: Project) => item.name}diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelteindex d18e65996..ed36b406a 100644--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte@@ -11,6 +11,7 @@import { createSettingsForm } from '$lib/utils/settings-form';import SettingsRow from '$lib/components/settings/settings-row.svelte';import LocalePicker from '$lib/components/locale-picker.svelte';+ import SelectWithLabel from '$lib/components/form/select-with-label.svelte';import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';import ApplicationThemePicker from '$lib/components/application-theme/application-theme-picker.svelte';import { applyAccentColor } from '$lib/utils/theme';@@ -26,6 +27,7 @@const formSchema = z.object({applicationTheme: z.enum(APPLICATION_THEME_VALUES),+ iconCatalog: z.enum(['selfhst', 'dashboard-icons']),mobileNavigationMode: z.enum(['floating', 'docked']),mobileNavigationShowLabels: z.boolean(),sidebarHoverExpansion: z.boolean(),@@ -103,6 +105,14 @@);const isDarkMode = $derived(mode.current === 'dark');const isDefaultApplicationTheme = $derived($formInputs.applicationTheme.value === 'default');+ const iconCatalogOptions = $derived([+ { value: 'selfhst', label: m.icon_catalog_selfhst(), description: m.icon_catalog_selfhst_description() },+ {+ value: 'dashboard-icons',+ label: m.icon_catalog_dashboard_icons(),+ description: m.icon_catalog_dashboard_icons_description()+ }+ ]);function handleOledModeChange(checked: boolean) {$formInputs.oledMode.value = checked;@@ -150,6 +160,18 @@/></SettingsRow>+ <!-- Icon Catalog -->+ <SettingsRow label={m.icon_catalog()} description={m.icon_catalog_description()}>+ <SelectWithLabel+ id="iconCatalog"+ label={m.icon_catalog()}+ bind:value={$formInputs.iconCatalog.value}+ error={$formInputs.iconCatalog.error}+ disabled={isReadOnly}+ options={iconCatalogOptions}+ />+ </SettingsRow>+<!-- User Avatars --><SettingsRowlabel={m.general_user_avatars_heading()}diff --git a/types/container/container.go b/types/container/container.goindex a3c5cda42..f0f3a5df8 100644--- a/types/container/container.go+++ b/types/container/container.go@@ -722,6 +722,16 @@ type Summary struct {// Required: trueMounts []Mount `json:"mounts"`+ // IconLightURL is the resolved light icon URL for dark themes.+ //+ // Required: false+ IconLightURL string `json:"iconLightUrl,omitempty"`++ // IconDarkURL is the resolved dark icon URL for light themes.+ //+ // Required: false+ IconDarkURL string `json:"iconDarkUrl,omitempty"`+// UpdateInfo contains image update information for this container.//// Required: false@@ -837,6 +847,16 @@ type Details struct {// Required: falseComposeInfo *ComposeInfo `json:"composeInfo,omitempty"`+ // IconLightURL is the resolved light icon URL for dark themes.+ //+ // Required: false+ IconLightURL string `json:"iconLightUrl,omitempty"`++ // IconDarkURL is the resolved dark icon URL for light themes.+ //+ // Required: false+ IconDarkURL string `json:"iconDarkUrl,omitempty"`+// RedeployDisabled indicates whether redeploy actions are disabled for this container.//// Required: falsediff --git a/types/project/project.go b/types/project/project.goindex c72f86620..7b040788a 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -137,10 +137,15 @@ type RuntimeService struct {// Required: falseHealth *string `json:"health,omitempty"`- // IconURL is an optional icon URL derived from Arcane labels.+ // IconLightURL is an optional light icon URL for dark themes.//// Required: false- IconURL string `json:"iconUrl,omitempty"`+ IconLightURL string `json:"iconLightUrl,omitempty"`++ // IconDarkURL is an optional dark icon URL for light themes.+ //+ // Required: false+ IconDarkURL string `json:"iconDarkUrl,omitempty"`// ServiceConfig is the configuration of the service from the compose file.//@@ -334,10 +339,15 @@ type Details struct {// Required: truePath string `json:"path"`- // IconURL is the optional stack icon URL from compose metadata.+ // IconLightURL is the optional light stack icon URL for dark themes.+ //+ // Required: false+ IconLightURL string `json:"iconLightUrl,omitempty"`++ // IconDarkURL is the optional dark stack icon URL for light themes.//// Required: false- IconURL string `json:"iconUrl,omitempty"`+ IconDarkURL string `json:"iconDarkUrl,omitempty"`// URLs are optional custom stack URLs from compose metadata.//diff --git a/types/settings/settings.go b/types/settings/settings.goindex c3ded857f..5d7d9549d 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -227,6 +227,11 @@ type Update struct {// Required: falseApplicationTheme *string `json:"applicationTheme,omitempty"`+ // IconCatalog is the catalog used to resolve icon slugs.+ //+ // Required: false+ IconCatalog *string `json:"iconCatalog,omitempty"`+// AuthLocalEnabled indicates if local authentication is enabled.//// Required: false