chore(docker): update environment variable prefixes to AMCS
This commit is contained in:
@@ -36,7 +36,7 @@ func ResolvePath(explicitPath string) string {
|
||||
return explicitPath
|
||||
}
|
||||
|
||||
if envPath := strings.TrimSpace(os.Getenv("OB1_CONFIG")); envPath != "" {
|
||||
if envPath := strings.TrimSpace(os.Getenv("AMCS_CONFIG")); envPath != "" {
|
||||
return envPath
|
||||
}
|
||||
|
||||
@@ -98,14 +98,14 @@ func defaultConfig() Config {
|
||||
}
|
||||
|
||||
func applyEnvOverrides(cfg *Config) {
|
||||
overrideString(&cfg.Database.URL, "OB1_DATABASE_URL")
|
||||
overrideString(&cfg.AI.LiteLLM.BaseURL, "OB1_LITELLM_BASE_URL")
|
||||
overrideString(&cfg.AI.LiteLLM.APIKey, "OB1_LITELLM_API_KEY")
|
||||
overrideString(&cfg.AI.Ollama.BaseURL, "OB1_OLLAMA_BASE_URL")
|
||||
overrideString(&cfg.AI.Ollama.APIKey, "OB1_OLLAMA_API_KEY")
|
||||
overrideString(&cfg.AI.OpenRouter.APIKey, "OB1_OPENROUTER_API_KEY")
|
||||
overrideString(&cfg.Database.URL, "AMCS_DATABASE_URL")
|
||||
overrideString(&cfg.AI.LiteLLM.BaseURL, "AMCS_LITELLM_BASE_URL")
|
||||
overrideString(&cfg.AI.LiteLLM.APIKey, "AMCS_LITELLM_API_KEY")
|
||||
overrideString(&cfg.AI.Ollama.BaseURL, "AMCS_OLLAMA_BASE_URL")
|
||||
overrideString(&cfg.AI.Ollama.APIKey, "AMCS_OLLAMA_API_KEY")
|
||||
overrideString(&cfg.AI.OpenRouter.APIKey, "AMCS_OPENROUTER_API_KEY")
|
||||
|
||||
if value, ok := os.LookupEnv("OB1_SERVER_PORT"); ok {
|
||||
if value, ok := os.LookupEnv("AMCS_SERVER_PORT"); ok {
|
||||
if port, err := strconv.Atoi(strings.TrimSpace(value)); err == nil {
|
||||
cfg.Server.Port = port
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
)
|
||||
|
||||
func TestResolvePathPrecedence(t *testing.T) {
|
||||
t.Setenv("OB1_CONFIG", "/tmp/from-env.yaml")
|
||||
t.Setenv("AMCS_CONFIG", "/tmp/from-env.yaml")
|
||||
|
||||
if got := ResolvePath("/tmp/explicit.yaml"); got != "/tmp/explicit.yaml" {
|
||||
t.Fatalf("ResolvePath explicit = %q, want %q", got, "/tmp/explicit.yaml")
|
||||
@@ -47,9 +47,9 @@ logging:
|
||||
t.Fatalf("write config: %v", err)
|
||||
}
|
||||
|
||||
t.Setenv("OB1_DATABASE_URL", "postgres://from-env")
|
||||
t.Setenv("OB1_LITELLM_API_KEY", "env-key")
|
||||
t.Setenv("OB1_SERVER_PORT", "9090")
|
||||
t.Setenv("AMCS_DATABASE_URL", "postgres://from-env")
|
||||
t.Setenv("AMCS_LITELLM_API_KEY", "env-key")
|
||||
t.Setenv("AMCS_SERVER_PORT", "9090")
|
||||
|
||||
cfg, loadedFrom, err := Load(configPath)
|
||||
if err != nil {
|
||||
@@ -102,8 +102,8 @@ logging:
|
||||
t.Fatalf("write config: %v", err)
|
||||
}
|
||||
|
||||
t.Setenv("OB1_OLLAMA_BASE_URL", "https://ollama.example.com/v1")
|
||||
t.Setenv("OB1_OLLAMA_API_KEY", "remote-key")
|
||||
t.Setenv("AMCS_OLLAMA_BASE_URL", "https://ollama.example.com/v1")
|
||||
t.Setenv("AMCS_OLLAMA_API_KEY", "remote-key")
|
||||
|
||||
cfg, _, err := Load(configPath)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user