Skip to content

Rename env vars CAGENT_ to DOCKER_AGENT_ (keep support for old env vars) #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtardif merged 2 commits into from
Mar 4, 2026
+15 −9
Merged

Rename env vars CAGENT_ to DOCKER_AGENT_ (keep support for old env vars) #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d11df0
Support DOCKER_AGENT_MODELS_GATEWAY, keep support for CAGENT_MODELS_G…
gtardif Mar 4, 2026
e17dbae
Support DOCKER_AGENT_DEFAULT_MODEL and keep support for CAGENT_DEFAUL…
gtardif Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ tasks:
test:
aliases: [t]
desc: Run tests
cmd: CAGENT_MODELS_GATEWAY= OPENAI_API_KEY= ANTHROPIC_API_KEY= GOOGLE_API_KEY= GOOGLE_GENAI_USE_VERTEXAI= MISTRAL_API_KEY= GITHUB_TOKEN= go test {{.CLI_ARGS}} ./...
cmd: DOCKER_AGENT_MODELS_GATEWAY= OPENAI_API_KEY= ANTHROPIC_API_KEY= GOOGLE_API_KEY= GOOGLE_GENAI_USE_VERTEXAI= MISTRAL_API_KEY= GITHUB_TOKEN= go test {{.CLI_ARGS}} ./...

test-binary:
deps: ["deploy-local"]
desc: Run tests on build binary
cmd: CAGENT_MODELS_GATEWAY= OPENAI_API_KEY= ANTHROPIC_API_KEY= GOOGLE_API_KEY= GOOGLE_GENAI_USE_VERTEXAI= MISTRAL_API_KEY= GITHUB_TOKEN= go test -tags=binary_required {{.CLI_ARGS}} ./e2e/binary/...
cmd: DOCKER_AGENT_MODELS_GATEWAY= OPENAI_API_KEY= ANTHROPIC_API_KEY= GOOGLE_API_KEY= GOOGLE_GENAI_USE_VERTEXAI= MISTRAL_API_KEY= GITHUB_TOKEN= go test -tags=binary_required {{.CLI_ARGS}} ./e2e/binary/...

build-local:
desc: Build binaries for local host platform
Expand Down
12 changes: 9 additions & 3 deletions cmd/root/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ import (
)

const (
flagModelsGateway = "models-gateway"
envModelsGateway = "CAGENT_MODELS_GATEWAY"
envDefaultModel = "CAGENT_DEFAULT_MODEL"
flagModelsGateway = "models-gateway"
envModelsGateway = "DOCKER_AGENT_MODELS_GATEWAY"
cagentEnvModelsGateway = "CAGENT_MODELS_GATEWAY"
envDefaultModel = "DOCKER_AGENT_DEFAULT_MODEL"
cagentEnvDefaultModel = "CAGENT_DEFAULT_MODEL"
)

func addRuntimeConfigFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
Expand Down Expand Up @@ -78,6 +80,8 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
if runConfig.ModelsGateway == "" {
if gateway := os.Getenv(envModelsGateway); gateway != "" {
runConfig.ModelsGateway = gateway
} else if gateway := os.Getenv(cagentEnvModelsGateway); gateway != "" {
runConfig.ModelsGateway = gateway
} else if userCfg.ModelsGateway != "" {
runConfig.ModelsGateway = userCfg.ModelsGateway
}
Expand All @@ -87,6 +91,8 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
// Precedence for default model: environment variable > user config
if model := os.Getenv(envDefaultModel); model != "" {
runConfig.DefaultModel = parseModelShorthand(model)
} else if model := os.Getenv(cagentEnvDefaultModel); model != "" {
runConfig.DefaultModel = parseModelShorthand(model)
} else if userCfg.DefaultModel != nil {
runConfig.DefaultModel = &userCfg.DefaultModel.ModelConfig
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/root/flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestGatewayLogic(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Setenv("CAGENT_MODELS_GATEWAY", tt.env)
t.Setenv("DOCKER_AGENT_MODELS_GATEWAY", tt.env)

// Mock user config loader
original := loadUserConfig
Expand Down Expand Up @@ -229,7 +229,7 @@ func TestDefaultModelLogic(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Setenv("CAGENT_DEFAULT_MODEL", tt.env)
t.Setenv("DOCKER_AGENT_DEFAULT_MODEL", tt.env)

// Mock user config loader
original := loadUserConfig
Expand Down
4 changes: 2 additions & 2 deletions pkg/evaluation/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ func (r *Runner) runCagentInContainer(ctx context.Context, imageID string, quest
}

if r.runConfig.ModelsGateway != "" {
args = append(args, "-e", "CAGENT_MODELS_GATEWAY")
env = append(env, "CAGENT_MODELS_GATEWAY="+r.runConfig.ModelsGateway)
args = append(args, "-e", "DOCKER_AGENT_MODELS_GATEWAY")
env = append(env, "DOCKER_AGENT_MODELS_GATEWAY="+r.runConfig.ModelsGateway)

if token, ok := r.runConfig.EnvProvider().Get(ctx, environment.DockerDesktopTokenEnv); ok && token != "" {
args = append(args, "-e", environment.DockerDesktopTokenEnv)
Expand Down
Loading