Skip to content

Modern Docker Management, Designed for Everyone

fix: don't override env vars with default settings (#558)

Kyle Mendell2bd7d69a13ee
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index 2ebf7f857..0a3d6a800 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -78,6 +78,14 @@ func InitializeApp() (*App, error) {
// Ensure default settings but skip user bootstrap in agent mode
slog.InfoContext(appCtx, "Ensuring default settings are initialized")
+ if cfg.AgentMode || cfg.UIConfigurationDisabled {
+ if err := appServices.Settings.PersistEnvSettingsIfMissing(appCtx); err != nil {
+ slog.WarnContext(appCtx, "Failed to persist env-driven settings", slog.String("error", err.Error()))
+ } else {
+ slog.DebugContext(appCtx, "Persisted env-driven settings if missing")
+ }
+ }
+
if err := appServices.Settings.EnsureDefaultSettings(appCtx); err != nil {
slog.WarnContext(appCtx, "Failed to initialize default settings", slog.String("error", err.Error()))
} else {
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index ed9be2029..80c02655b 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -7,6 +7,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "log/slog"
"os"
"reflect"
"strings"
@@ -98,6 +99,9 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
func (s *SettingsService) loadDatabaseSettingsInternal(ctx context.Context, db *database.DB) (*models.Settings, error) {
if config.Load().UIConfigurationDisabled || config.Load().AgentMode {
+ // debug: show why we're using env path
+ slog.DebugContext(ctx, "loadDatabaseSettingsInternal: using env path", "UIConfigurationDisabled", config.Load().UIConfigurationDisabled, "AgentMode", config.Load().AgentMode, "Environment", config.Load().Environment)
+
dst, err := s.loadDatabaseConfigFromEnv(ctx, db)
if config.Load().Environment != "testing" {
@@ -163,12 +167,29 @@ func (s *SettingsService) loadDatabaseConfigFromEnv(ctx context.Context, db *dat
envVarName := utils.CamelCaseToScreamingSnakeCase(key)
- value, ok := os.LookupEnv(envVarName)
- if ok {
- rv.Field(i).FieldByName("Value").SetString(value)
+ // debug: log each env name checked and whether a value exists
+ if val, ok := os.LookupEnv(envVarName); ok {
+ mask := "<empty>"
+ if len(val) > 0 {
+ mask = fmt.Sprintf("%d chars", len(val))
+ }
+ slog.DebugContext(ctx, "loadDatabaseConfigFromEnv: env override found", "key", key, "env", envVarName, "valueMasked", mask)
+ rv.Field(i).FieldByName("Value").SetString(val)
continue
+ } else {
+ slog.DebugContext(ctx, "loadDatabaseConfigFromEnv: env not set", "key", key, "env", envVarName)
+ }
+ }
+
+ // debug: final snapshot (only show which fields are non-empty)
+ count := 0
+ for i := range rt.NumField() {
+ v := rv.Field(i).FieldByName("Value").String()
+ if v != "" {
+ count++
}
}
+ slog.DebugContext(ctx, "loadDatabaseConfigFromEnv: completed env load", "loadedFields", count)
return dest, nil
}
@@ -387,6 +408,43 @@ func (s *SettingsService) EnsureDefaultSettings(ctx context.Context) error {
return nil
}
+func (s *SettingsService) PersistEnvSettingsIfMissing(ctx context.Context) error {
+ settings := s.GetSettingsConfig()
+ vars := settings.ToSettingVariableSlice(true, false)
+
+ if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+ for _, v := range vars {
+ envVal, ok := os.LookupEnv(v.Key)
+ if !ok {
+ continue
+ }
+
+ var existing models.SettingVariable
+ err := tx.Where("key = ?", v.Key).First(&existing).Error
+ switch {
+ case errors.Is(err, gorm.ErrRecordNotFound):
+ newVar := models.SettingVariable{Key: v.Key, Value: envVal}
+ if err := tx.Create(&newVar).Error; err != nil {
+ return fmt.Errorf("persist env setting %s: %w", v.Key, err)
+ }
+ case err != nil:
+ return fmt.Errorf("check setting %s: %w", v.Key, err)
+ default:
+ if existing.Value != envVal {
+ if err := tx.Model(&existing).Update("value", envVal).Error; err != nil {
+ return fmt.Errorf("update env setting %s: %w", v.Key, err)
+ }
+ }
+ }
+ }
+ return nil
+ }); err != nil {
+ return err
+ }
+
+ return nil
+}
+
func (s *SettingsService) ListSettings(all bool) []models.SettingVariable {
return s.GetSettingsConfig().ToSettingVariableSlice(all, true)
}