From 3480f9a3c80933fc74f7671127ffa6fc2c9175e2 Mon Sep 17 00:00:00 2001 From: Richard Palethorpe Date: Fri, 13 Mar 2026 15:17:35 +0000 Subject: [PATCH] fix(conf): Don't overwrite env provided galleries with runtime conf Signed-off-by: Richard Palethorpe --- core/application/config_file_watcher.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/application/config_file_watcher.go b/core/application/config_file_watcher.go index 90b78485d8de..d9b1671ac8c7 100644 --- a/core/application/config_file_watcher.go +++ b/core/application/config_file_watcher.go @@ -6,6 +6,7 @@ import ( "os" "path" "path/filepath" + "slices" "time" "dario.cat/mergo" @@ -211,6 +212,8 @@ func readRuntimeSettingsJson(startupAppConfig config.ApplicationConfig) fileHand envP2PToken := appConfig.P2PToken == startupAppConfig.P2PToken envP2PNetworkID := appConfig.P2PNetworkID == startupAppConfig.P2PNetworkID envFederated := appConfig.Federated == startupAppConfig.Federated + envGalleries := slices.Equal(appConfig.Galleries, startupAppConfig.Galleries) + envBackendGalleries := slices.Equal(appConfig.BackendGalleries, startupAppConfig.BackendGalleries) envAutoloadGalleries := appConfig.AutoloadGalleries == startupAppConfig.AutoloadGalleries envAutoloadBackendGalleries := appConfig.AutoloadBackendGalleries == startupAppConfig.AutoloadBackendGalleries envAgentJobRetentionDays := appConfig.AgentJobRetentionDays == startupAppConfig.AgentJobRetentionDays @@ -324,10 +327,10 @@ func readRuntimeSettingsJson(startupAppConfig config.ApplicationConfig) fileHand if settings.Federated != nil && !envFederated { appConfig.Federated = *settings.Federated } - if settings.Galleries != nil { + if settings.Galleries != nil && !envGalleries { appConfig.Galleries = *settings.Galleries } - if settings.BackendGalleries != nil { + if settings.BackendGalleries != nil && !envBackendGalleries { appConfig.BackendGalleries = *settings.BackendGalleries } if settings.AutoloadGalleries != nil && !envAutoloadGalleries {