Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: env values being injected into all containers by default (#1250)
Kyle Mendell3de5b4e68237
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 0e8c63038..2b784367c 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -57,6 +57,7 @@ type Settings struct {AutoUpdateInterval SettingVariable `key:"autoUpdateInterval" meta:"label=Auto Update Interval;type=number;keywords=auto,update,interval,frequency,schedule,automatic,timing;category=internal;description=Interval between automatic updates"`PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=internal;description=Enable automatic checking for image updates"`PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=number;keywords=interval,frequency,schedule,time,minutes,period,delay;category=internal;description=How often to check for image updates"`+ AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`PruneMode SettingVariable `key:"dockerPruneMode" meta:"label=Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk;category=internal;description=Configure how unused Docker images are cleaned up"`MaxImageUploadSize SettingVariable `key:"maxImageUploadSize" meta:"label=Max Image Upload Size;type=number;keywords=upload,size,limit,maximum,image,tar,file,megabytes,mb,storage;category=internal;description=Maximum size in MB for image archive uploads (default: 500)"`DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=internal;description=URI for Docker daemon"`diff --git a/backend/internal/services/playwright_service.go b/backend/internal/services/playwright_service.goindex 88079c261..00a49e9e8 100644--- a/backend/internal/services/playwright_service.go+++ b/backend/internal/services/playwright_service.go@@ -12,14 +12,14 @@ import ()type PlaywrightService struct {- apiKeyService *ApiKeyService- userService *UserService+ apiKeyService *ApiKeyService+ userService *UserService}func NewPlaywrightService(apiKeyService *ApiKeyService, userService *UserService) *PlaywrightService {return &PlaywrightService{- apiKeyService: apiKeyService,- userService: userService,+ apiKeyService: apiKeyService,+ userService: userService,}}diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 7c003f7b7..092c205d3 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -147,7 +147,8 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strinprojectsDirectory = "data/projects"}- project, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ project, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory, autoInjectEnv)if loadErr != nil {return []ProjectServiceInfo{}, fmt.Errorf("failed to load compose project from %s: %w", projectFromDb.Path, loadErr)}@@ -277,7 +278,8 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringprojectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")projectsDirectory, _ := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))if composeFile != "" {- composeProj, loadErr := projects.LoadComposeProject(ctx, composeFile, normalizeComposeProjectName(proj.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ composeProj, loadErr := projects.LoadComposeProject(ctx, composeFile, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv)if loadErr == nil && composeProj != nil {// Convert map to slicesvcList := make([]composetypes.ServiceConfig, 0, len(composeProj.Services))@@ -622,7 +624,8 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, usprojectsDirectory = "data/projects"}- project, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ project, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory, autoInjectEnv)if loadErr != nil {return fmt.Errorf("failed to load compose project from %s: %w", projectFromDb.Path, loadErr)}@@ -670,7 +673,8 @@ func (s *ProjectService) DownProject(ctx context.Context, projectID string, userprojectsDirectory = "data/projects"}- proj, _, lerr := projects.LoadComposeProjectFromDir(ctx, projectFromDb.Path, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ proj, _, lerr := projects.LoadComposeProjectFromDir(ctx, projectFromDb.Path, normalizeComposeProjectName(projectFromDb.Name), projectsDirectory, autoInjectEnv)if lerr != nil {_ = s.updateProjectStatusInternal(ctx, projectID, models.ProjectStatusRunning)return fmt.Errorf("failed to load compose project: %w", lerr)@@ -767,7 +771,8 @@ func (s *ProjectService) DestroyProject(ctx context.Context, projectID string, rprojectsDirectory = "data/projects"}- if compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory); lerr == nil {+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ if compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv); lerr == nil {if derr := projects.ComposeDown(ctx, compProj, true); derr != nil {slog.WarnContext(ctx, "failed to remove volumes", "error", derr)}@@ -831,7 +836,8 @@ func (s *ProjectService) PullProjectImages(ctx context.Context, projectID stringprojectsDirectory = "data/projects"}- compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv)if lerr != nil {return fmt.Errorf("failed to load compose project: %w", lerr)}@@ -869,7 +875,8 @@ func (s *ProjectService) EnsureProjectImagesPresent(ctx context.Context, projectprojectsDirectory = "data/projects"}- compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv)if lerr != nil {return fmt.Errorf("failed to load compose project: %w", lerr)}@@ -918,7 +925,8 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, uprojectsDirectory = "data/projects"}- compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv)if lerr != nil {_ = s.updateProjectStatusInternal(ctx, projectID, models.ProjectStatusRunning)return fmt.Errorf("failed to load compose project: %w", lerr)@@ -1227,7 +1235,8 @@ func (s *ProjectService) countServicesFromCompose(ctx context.Context, p models.return 0, err}- proj, _, err := projects.LoadComposeProjectFromDir(ctx, p.Path, normalizeComposeProjectName(p.Name), projectsDirectory)+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ proj, _, err := projects.LoadComposeProjectFromDir(ctx, p.Path, normalizeComposeProjectName(p.Name), projectsDirectory, autoInjectEnv)if err != nil {return 0, err}diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 17908ae0a..61cd52397 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -83,6 +83,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {AutoUpdateInterval: models.SettingVariable{Value: "1440"},PollingEnabled: models.SettingVariable{Value: "true"},PollingInterval: models.SettingVariable{Value: "60"},+ AutoInjectEnv: models.SettingVariable{Value: "false"},PruneMode: models.SettingVariable{Value: "dangling"},BaseServerURL: models.SettingVariable{Value: "http://localhost"},EnableGravatar: models.SettingVariable{Value: "true"},diff --git a/backend/internal/utils/projects/env.go b/backend/internal/utils/projects/env.goindex 5fc7745fe..0b37ec882 100644--- a/backend/internal/utils/projects/env.go+++ b/backend/internal/utils/projects/env.go@@ -12,7 +12,7 @@ import ("github.com/compose-spec/compose-go/v2/dotenv")-const filePerm = 0644+const filePerm = 0600const (globalEnvFileName = ".env.global"@@ -27,14 +27,16 @@ const (type EnvMap map[string]stringtype EnvLoader struct {- projectsDir string- workdir string+ projectsDir string+ workdir string+ autoInjectEnv bool}-func NewEnvLoader(projectsDir, workdir string) *EnvLoader {+func NewEnvLoader(projectsDir, workdir string, autoInjectEnv bool) *EnvLoader {return &EnvLoader{- projectsDir: projectsDir,- workdir: workdir,+ projectsDir: projectsDir,+ workdir: workdir,+ autoInjectEnv: autoInjectEnv,}}@@ -155,7 +157,9 @@ func (l *EnvLoader) loadAndMergeProjectEnv(ctx context.Context, path string, envfor k, v := range projectEnv {envMap[k] = v- injectionVars[k] = v+ if l.autoInjectEnv {+ injectionVars[k] = v+ }slog.DebugContext(ctx, "Loaded env var from project .env", "key", k, "value", v)}diff --git a/backend/internal/utils/projects/env_test.go b/backend/internal/utils/projects/env_test.gonew file mode 100644index 000000000..35903bf4b--- /dev/null+++ b/backend/internal/utils/projects/env_test.go@@ -0,0 +1,69 @@+package projects++import (+ "context"+ "os"+ "path/filepath"+ "testing"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestLoadEnvironment(t *testing.T) {+ // Setup temp dirs+ tmpDir := t.TempDir()+ projectsDir := filepath.Join(tmpDir, "projects")+ workdir := filepath.Join(projectsDir, "myproject")++ err := os.MkdirAll(workdir, 0755)+ require.NoError(t, err)++ // Create .env.global+ globalEnvContent := "GLOBAL_VAR=global_value\nSHARED_VAR=global_shared"+ err = os.WriteFile(filepath.Join(projectsDir, ".env.global"), []byte(globalEnvContent), 0600)+ require.NoError(t, err)++ // Create .env+ projectEnvContent := "PROJECT_VAR=project_value\nSHARED_VAR=project_shared"+ err = os.WriteFile(filepath.Join(workdir, ".env"), []byte(projectEnvContent), 0600)+ require.NoError(t, err)++ t.Run("AutoInjectEnv=false", func(t *testing.T) {+ loader := NewEnvLoader(projectsDir, workdir, false)+ ctx := context.Background()++ envMap, injectionVars, err := loader.LoadEnvironment(ctx)+ require.NoError(t, err)++ // Verify envMap (should contain all vars, project overrides global)+ assert.Equal(t, "global_value", envMap["GLOBAL_VAR"])+ assert.Equal(t, "project_value", envMap["PROJECT_VAR"])+ assert.Equal(t, "project_shared", envMap["SHARED_VAR"])++ // Verify injectionVars (should ONLY contain global vars)+ assert.Equal(t, "global_value", injectionVars["GLOBAL_VAR"])+ assert.Equal(t, "global_shared", injectionVars["SHARED_VAR"])++ _, projectVarInInjection := injectionVars["PROJECT_VAR"]+ assert.False(t, projectVarInInjection, "Project variable should not be in injectionVars")+ })++ t.Run("AutoInjectEnv=true", func(t *testing.T) {+ loader := NewEnvLoader(projectsDir, workdir, true)+ ctx := context.Background()++ envMap, injectionVars, err := loader.LoadEnvironment(ctx)+ require.NoError(t, err)++ // Verify envMap+ assert.Equal(t, "global_value", envMap["GLOBAL_VAR"])+ assert.Equal(t, "project_value", envMap["PROJECT_VAR"])+ assert.Equal(t, "project_shared", envMap["SHARED_VAR"])++ // Verify injectionVars (should contain both global and project vars)+ assert.Equal(t, "global_value", injectionVars["GLOBAL_VAR"])+ assert.Equal(t, "project_value", injectionVars["PROJECT_VAR"])+ assert.Equal(t, "project_shared", injectionVars["SHARED_VAR"])+ })+}diff --git a/backend/internal/utils/projects/load.go b/backend/internal/utils/projects/load.goindex 52456e097..5944264bf 100644--- a/backend/internal/utils/projects/load.go+++ b/backend/internal/utils/projects/load.go@@ -37,7 +37,7 @@ func DetectComposeFile(dir string) (string, error) {return compose, nil}-func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsDirectory string) (*composetypes.Project, error) {+func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsDirectory string, autoInjectEnv bool) (*composetypes.Project, error) {workdir := filepath.Dir(composeFile)projectsDir := projectsDirectory@@ -45,7 +45,7 @@ func LoadComposeProject(ctx context.Context, composeFile, projectName, projectsDprojectsDir = filepath.Dir(workdir)}- envLoader := NewEnvLoader(projectsDir, workdir)+ envLoader := NewEnvLoader(projectsDir, workdir, autoInjectEnv)// Load full environment (process + global + project .env) for service injectionfullEnvMap, injectionVars, err := envLoader.LoadEnvironment(ctx)@@ -122,7 +122,7 @@ func injectServiceConfiguration(project *composetypes.Project, injectionVars Env}}-func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDirectory string) (*composetypes.Project, string, error) {+func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDirectory string, autoInjectEnv bool) (*composetypes.Project, string, error) {composeFile, err := DetectComposeFile(dir)if err != nil {return nil, "", err@@ -132,7 +132,7 @@ func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDiprojectsDirectory = filepath.Dir(dir)}- proj, err := LoadComposeProject(ctx, composeFile, projectName, projectsDirectory)+ proj, err := LoadComposeProject(ctx, composeFile, projectName, projectsDirectory, autoInjectEnv)if err != nil {return nil, "", err}diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 3ed14d681..ad602f8f9 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -866,6 +866,8 @@"docker_auto_update_interval_label": "Auto-update Interval (minutes)","docker_auto_update_interval_placeholder": "60","docker_auto_update_interval_description": "How often to perform automatic updates (5-1440 minutes)",+ "docker_auto_inject_env_label": "Auto Inject Env Variables",+ "docker_auto_inject_env_description": "Automatically inject project .env variables into all containers","docker_rate_limit_warning_title": "Rate Limiting Warning","docker_rate_limit_warning_description": "Polling intervals below 30 minutes may trigger registry rate limits. Prefer longer intervals in production.","_comment_settings_navigation": "=== SETTINGS - NAVIGATION ===",diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.tsindex e1751bc00..fea00d6f5 100644--- a/frontend/src/lib/types/settings.type.ts+++ b/frontend/src/lib/types/settings.type.ts@@ -16,6 +16,7 @@ export type Settings = {defaultShell: string;dockerHost: string;accentColor: string;+ autoInjectEnv: boolean;authLocalEnabled: boolean;authSessionTimeout: number;diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelteindex c0d00ca2b..2b7ba3f78 100644--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte@@ -76,6 +76,7 @@let formPollingInterval = $state(60);let formAutoUpdate = $state(false);let formAutoUpdateInterval = $state(1440);+ let formAutoInjectEnv = $state(false);let formPruneMode = $state<'all' | 'dangling'>('dangling');let formDefaultShell = $state('/bin/sh');let formProjectsDirectory = $state('data/projects');@@ -136,6 +137,7 @@formPollingInterval = settings.pollingInterval;formAutoUpdate = settings.autoUpdate;formAutoUpdateInterval = settings.autoUpdateInterval;+ formAutoInjectEnv = settings.autoInjectEnv;formPruneMode = settings.dockerPruneMode || 'dangling';formDefaultShell = settings.defaultShell || '/bin/sh';formProjectsDirectory = settings.projectsDirectory || 'data/projects';@@ -191,6 +193,7 @@formPollingInterval !== settings.pollingInterval ||formAutoUpdate !== settings.autoUpdate ||formAutoUpdateInterval !== settings.autoUpdateInterval ||+ formAutoInjectEnv !== settings.autoInjectEnv ||formPruneMode !== (settings.dockerPruneMode || 'dangling') ||formDefaultShell !== (settings.defaultShell || '/bin/sh') ||formProjectsDirectory !== (settings.projectsDirectory || 'data/projects') ||@@ -215,6 +218,7 @@formPollingInterval = settings.pollingInterval;formAutoUpdate = settings.autoUpdate;formAutoUpdateInterval = settings.autoUpdateInterval;+ formAutoInjectEnv = settings.autoInjectEnv;formPruneMode = settings.dockerPruneMode || 'dangling';formDefaultShell = settings.defaultShell || '/bin/sh';@@ -297,6 +301,7 @@pollingInterval: formPollingInterval,autoUpdate: formAutoUpdate,autoUpdateInterval: formAutoUpdateInterval,+ autoInjectEnv: formAutoInjectEnv,dockerPruneMode: formPruneMode,defaultShell: formDefaultShell,projectsDirectory: formProjectsDirectory,@@ -337,6 +342,7 @@formPollingInterval = settings.pollingInterval;formAutoUpdate = settings.autoUpdate;formAutoUpdateInterval = settings.autoUpdateInterval;+ formAutoInjectEnv = settings.autoInjectEnv;formPruneMode = settings.dockerPruneMode || 'dangling';formDefaultShell = settings.defaultShell || '/bin/sh';formProjectsDirectory = settings.projectsDirectory || 'data/projects';@@ -788,6 +794,16 @@</div>{/if}</div>++ <div class="space-y-4 rounded-lg border p-4">+ <div class="flex items-center justify-between">+ <div class="space-y-0.5">+ <Label for="auto-inject-env" class="text-sm font-medium">{m.docker_auto_inject_env_label()}</Label>+ <div class="text-muted-foreground text-xs">{m.docker_auto_inject_env_description()}</div>+ </div>+ <Switch id="auto-inject-env" bind:checked={formAutoInjectEnv} />+ </div>+ </div></div></Tabs.Content></Tabs.Root>diff --git a/types/settings/settings.go b/types/settings/settings.goindex 874d7db68..6bfcd48cb 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -61,6 +61,11 @@ type Update struct {// Required: falsePollingInterval *string `json:"pollingInterval,omitempty"`+ // AutoInjectEnv indicates if project .env variables should be automatically injected into all containers.+ //+ // Required: false+ AutoInjectEnv *string `json:"autoInjectEnv,omitempty"`+// EnvironmentHealthInterval is the interval for checking environment health.//// Required: false