Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat(projects): honor COMPOSE_FILE and other pre-defined env vars (#3709)
Kyle Mendell6e1dbb2d2285
diff --git a/backend/internal/common/errors.go b/backend/internal/common/errors.goindex c5b59987a..f41719d1d 100644--- a/backend/internal/common/errors.go+++ b/backend/internal/common/errors.go@@ -113,6 +113,7 @@ var (ErrVolumeRenameProtected = Classify(ErrBadRequest, errors.Sentinel("Arcane's internal volumes cannot be renamed"))ErrProjectComposeFileNotFound = Classify(ErrNotFound, errors.Sentinel("Project compose file not found"))ErrComposeFileNotFound = Classify(ErrNotFound, errors.Sentinel("no compose file found"))+ ErrComposeFileEnvInvalid = Classify(ErrValidation, errors.Sentinel("invalid COMPOSE_FILE selection"))ErrEnvironmentInvalidProxyTarget = Classify(ErrBadRequest, errors.Sentinel("Invalid proxy target URL"))ErrEnvironmentConnectionTestFailed = Classify(ErrBadRequest, errors.Sentinel("Environment connection test failed"))ErrUnsafeRemoteURL = Classify(ErrBadRequest, errors.Sentinel("Remote URL is not allowed"))diff --git a/backend/internal/gitops/gitops_sync.go b/backend/internal/gitops/gitops_sync.goindex 9bbed80eb..901720089 100644--- a/backend/internal/gitops/gitops_sync.go+++ b/backend/internal/gitops/gitops_sync.go@@ -1068,6 +1068,17 @@ func singleFileSyncedFilesInternal(sync *projectpkg.GitOpsSync, source *preparedfunc (s *GitOpsSyncService) performSingleFileSyncInternal(ctx context.Context, sync *projectpkg.GitOpsSync, id string, actor common.User, result *gitops.SyncResult, source *preparedSyncSource) (*gitops.SyncResult, error) {slog.InfoContext(ctx, "Using single file sync mode", "syncId", id, "composePath", sync.ComposePath)+ // Single-file sync copies only the one compose file (plus .env and a sibling+ // override). If the synced .env references additional files via COMPOSE_FILE+ // or COMPOSE_ENV_FILES, those files never reach the project, so direct the+ // user to directory sync instead of silently deploying an incomplete+ // selection.+ if composeFileEnvNeedsDirectorySyncInternal(sync, source) {+ return result, s.failSync(ctx, id, result, sync, actor,+ "COMPOSE_FILE or COMPOSE_ENV_FILES references additional files",+ "the synced .env references additional files via COMPOSE_FILE or COMPOSE_ENV_FILES; enable \"Sync entire directory\" for this sync")+ }+syncedFiles := singleFileSyncedFilesInternal(sync, source)project, err := s.getOrCreateProjectInternal(ctx, sync, id, source.composeContent, source.envContent, source.overrideContent, source.overrideFileName, result, actor)@@ -1087,6 +1098,47 @@ func (s *GitOpsSyncService) performSingleFileSyncInternal(ctx context.Context, sreturn result, nil}+// composeFileEnvNeedsDirectorySyncInternal reports whether the synced .env+// declares a COMPOSE_FILE or COMPOSE_ENV_FILES selection that single-file sync+// cannot satisfy — i.e. it references any file other than the ones single-file+// sync actually ships (the synced compose file, its sibling override, and .env+// itself), or any file in a subdirectory.+func composeFileEnvNeedsDirectorySyncInternal(sync *projectpkg.GitOpsSync, source *preparedSyncSource) bool {+ if source == nil || source.envContent == nil {+ return false+ }+ envMap, err := projects.ParseProjectEnvContent(*source.envContent, nil)+ if err != nil || len(envMap) == 0 {+ return false+ }++ allowedComposeFiles := map[string]struct{}{filepath.Base(sync.ComposePath): {}}+ if source.overrideFileName != "" {+ allowedComposeFiles[source.overrideFileName] = struct{}{}+ }+ if entriesNeedDirectorySyncInternal(projects.ComposeFileEntriesFromEnv(envMap), allowedComposeFiles) {+ return true+ }++ // Single-file sync writes the synced env content to .env, so a+ // self-reference is satisfiable; anything else never reaches the project.+ return entriesNeedDirectorySyncInternal(projects.ComposeEnvFileEntriesFromEnv(envMap), map[string]struct{}{projects.EffectiveEnvFileName: {}})+}++func entriesNeedDirectorySyncInternal(entries []string, allowed map[string]struct{}) bool {+ for _, entry := range entries {+ // Normalize so relative prefixes like "./compose.yaml" match allowed.+ cleaned := filepath.Clean(entry)+ if cleaned != filepath.Base(cleaned) {+ return true // nested path can't be single-file synced+ }+ if _, ok := allowed[cleaned]; !ok {+ return true+ }+ }+ return false+}+// performSwarmStackSyncInternal executes a single file sync targeted at a Swarm Stackfunc (s *GitOpsSyncService) performSwarmStackSyncInternal(ctx context.Context, sync *projectpkg.GitOpsSync, id string, actor common.User, result *gitops.SyncResult, source *preparedSyncSource) (*gitops.SyncResult, error) {slog.InfoContext(ctx, "Deploying Swarm Stack from GitOps sync", "syncId", id, "stackName", sync.ProjectName)diff --git a/backend/internal/gitops/service_test.go b/backend/internal/gitops/service_test.goindex 5a0246d79..172a25b7f 100644--- a/backend/internal/gitops/service_test.go+++ b/backend/internal/gitops/service_test.go@@ -550,7 +550,7 @@ services:// merge rather than tracked as a raw synced file.require.ElementsMatch(t, []string{"docker-compose.yaml", "meta.yaml"}, syncedFiles)- composePath, detectErr := projects.DetectComposeFile(project.Path)+ composePath, detectErr := projects.DetectComposeFile(t.Context(), "", project.Path)require.NoError(t, detectErr)assert.Equal(t, filepath.Join(project.Path, "docker-compose.yaml"), composePath)@@ -650,7 +650,7 @@ services:require.True(t, changed)require.ElementsMatch(t, []string{"docker-compose.yaml", "nested/feature.yaml"}, syncedFiles)- composePath, detectErr := projects.DetectComposeFile(updatedProject.Path)+ composePath, detectErr := projects.DetectComposeFile(t.Context(), "", updatedProject.Path)require.NoError(t, detectErr)assert.Equal(t, filepath.Join(updatedProject.Path, "docker-compose.yaml"), composePath)@@ -945,7 +945,7 @@ func TestGitOpsSyncService_DirectorySync_RealWalkWithNestedConfig(t *testing.T)require.True(t, changed)require.ElementsMatch(t, []string{"docker-compose.yml", "config/dynamic_config.yml"}, syncedFiles)- composePath, detectErr := projects.DetectComposeFile(project.Path)+ composePath, detectErr := projects.DetectComposeFile(t.Context(), "", project.Path)require.NoError(t, detectErr)assert.Equal(t, filepath.Join(project.Path, "docker-compose.yml"), composePath)diff --git a/backend/internal/project/project_compose_cache.go b/backend/internal/project/project_compose_cache.goindex 0f8d75cd9..4289c3130 100644--- a/backend/internal/project/project_compose_cache.go+++ b/backend/internal/project/project_compose_cache.go@@ -40,7 +40,13 @@ type composeCacheEntry struct {composePath stringcomposeMtime time.TimeincludeMtimes map[string]time.Time- project *composetypes.Project+ // envMtimes tracks the env files that influence file selection and+ // interpolation (.env, .env.global, COMPOSE_ENV_FILES entries). A zero time+ // records a file that did not exist when the entry was cached, so its later+ // appearance also invalidates. Needed because .env now selects the file set+ // via COMPOSE_FILE.+ envMtimes map[string]time.Time+ project *composetypes.Project}func newParsedComposeCacheInternal() *parsedComposeCacheInternal {@@ -148,11 +154,31 @@ func (s *ProjectService) rebuildComposeNameCacheInternal(ctx context.Context) erreturn nil}+// ResolveProjectComposeFile returns the base compose file for a project. The+// precedence mirrors `docker compose`: COMPOSE_FILE in the merged environment+// (.env.global first, the project's .env on top) wins, then a GitOps sync's+// configured compose path, then standard detection.func (s *ProjectService) ResolveProjectComposeFile(ctx context.Context, proj *Project) (string, error) {if proj == nil {return "", errors.New("project is nil")}+ projectsDirectory := ""+ if s.settingsService != nil {+ var dirErr error+ projectsDirectory, dirErr = s.GetProjectsDirectory(ctx)+ if dirErr != nil {+ // The .env.global layer is skipped for an empty projects directory;+ // keep resolution working but surface the misconfiguration.+ slog.WarnContext(ctx, "failed to resolve projects directory for compose selection", "projectID", proj.ID, "error", dirErr)+ }+ }+ if files, selErr := projects.ComposeFileEnvSelection(ctx, projectsDirectory, proj.Path); selErr != nil {+ return "", selErr+ } else if len(files) > 0 {+ return files[0], nil+ }+if proj.GitOpsManagedBy != nil && strings.TrimSpace(*proj.GitOpsManagedBy) != "" {var syncRecord GitOpsSyncif err := s.db.WithContext(ctx).@@ -178,7 +204,7 @@ func (s *ProjectService) ResolveProjectComposeFile(ctx context.Context, proj *Pr}}- composeFile, err := projects.DetectComposeFile(proj.Path)+ composeFile, err := projects.DetectComposeFile(ctx, projectsDirectory, proj.Path)if err != nil {return "", common.Classify(common.ErrProjectComposeFileNotFound, errors.WrapIf(err, "Project compose file not found"))}@@ -231,6 +257,10 @@ func (s *ProjectService) getCachedComposeProjectInternal(ctx context.Context, prs.parsedCompose.entries.Delete(proj.ID)}+ if cfg == nil {+ cfg = s.settingsService.GetSettingsOrDefaults(ctx)+ }+entry, found, err := s.parsedCompose.entries.GetWithLoaders(proj.ID, func(_ []string) (map[string]composeCacheEntry, error) {composeProject, composePath, err := s.loadComposeProjectForProjectInternal(ctx, proj, cfg)if err != nil {@@ -240,6 +270,7 @@ func (s *ProjectService) getCachedComposeProjectInternal(ctx context.Context, prentry := composeCacheEntry{composePath: composePath,includeMtimes: make(map[string]time.Time),+ envMtimes: collectEnvMtimesInternal(proj, getProjectsDirectoryOrDefaultInternal(ctx, cfg), composeProject),project: composeProject,}// os.Stat rather than acfs here and below: see@@ -275,6 +306,34 @@ func (s *ProjectService) getCachedComposeProjectInternal(ctx context.Context, prreturn entry.project, nil}+// collectEnvMtimesInternal records the mtimes of every env file that influences+// compose-file selection or interpolation for a project: the project .env, the+// global .env.global, and any COMPOSE_ENV_FILES entries. A file that does not+// exist is recorded as a zero time so its later appearance invalidates too.+func collectEnvMtimesInternal(proj *Project, projectsDirectory string, composeProject *composetypes.Project) map[string]time.Time {+ paths := []string{+ filepath.Join(proj.Path, projects.EffectiveEnvFileName),+ filepath.Join(projectsDirectory, projects.GlobalEnvFileName),+ }+ if composeProject != nil {+ if envOpts, err := projects.ParseComposeEnvOptions(composeProject.WorkingDir, projects.EnvMap(composeProject.Environment)); err == nil {+ paths = append(paths, envOpts.EnvFiles...)+ }+ }++ mtimes := make(map[string]time.Time, len(paths))+ for _, p := range paths {+ // os.Stat rather than acfs: env files may be symlinks resolving outside+ // any confinement root (a supported setup).+ if info, err := os.Stat(p); err == nil {+ mtimes[p] = info.ModTime()+ } else {+ mtimes[p] = time.Time{}+ }+ }+ return mtimes+}+// The compose file and its includes are absolute paths compose-go resolved, and// either may legitimately be a symlink to, or a file under, a directory outside// the project (#3556). These invalidation probes therefore stay on os.Stat@@ -294,6 +353,21 @@ func validComposeCacheEntryInternal(entry composeCacheEntry) bool {return false}}+ for envPath, cachedMtime := range entry.envMtimes {+ info, err := os.Stat(envPath)+ switch {+ case err != nil:+ // Present when cached, now gone/unreadable: invalidate.+ if !cachedMtime.IsZero() {+ return false+ }+ case cachedMtime.IsZero():+ // Absent when cached, now present: invalidate.+ return false+ case !info.ModTime().Equal(cachedMtime):+ return false+ }+ }return true}diff --git a/backend/internal/project/project_details.go b/backend/internal/project/project_details.goindex 07dcc7c64..ed13e6375 100644--- a/backend/internal/project/project_details.go+++ b/backend/internal/project/project_details.go@@ -10,11 +10,13 @@ import ("io""log/slog""path/filepath"+ "slices""strings""sync""time""emperror.dev/errors"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"composetypes "github.com/compose-spec/compose-go/v2/types""github.com/getarcaneapp/arcane/backend/v2/pkg/projects"@@ -188,11 +190,11 @@ func (s *ProjectService) GetProjectContent(ctx context.Context, projectID string}composePath, composeErr := s.ResolveProjectComposeFile(ctx, proj)- if composeErr != nil {- composePath = ""+ if composeErr != nil && !errors.Is(composeErr, common.ErrProjectComposeFileNotFound) {+ return "", "", "", composeErr}- composeContent, envContent, err = projects.ReadProjectFiles(proj.Path, composePath)+ composeContent, envContent, err = projects.ReadProjectFiles(ctx, proj.Path, composePath)if err != nil {return "", "", "", err}@@ -200,12 +202,30 @@ func (s *ProjectService) GetProjectContent(ctx context.Context, projectID stringreturn composeContent, envContent, projects.ReadComposeOverrideContent(proj.Path), nil}+func (s *ProjectService) populateDetailsComposeContentInternal(ctx context.Context, proj *Project, opts project.DetailsOptions, composeSelection []string, resp *project.Details) error {+ if !opts.IncludeComposeContent {+ return nil+ }+ composeContent, _, overrideContent, err := s.GetProjectContent(ctx, proj.ID)+ if err != nil {+ return errors.WrapIf(err, "failed to read project compose content")+ }+ resp.ComposeContent = composeContent+ resp.OverrideFileName, resp.OverrideContent = resolveDetailsOverrideInternal(proj.Path, overrideContent, composeSelection)+ return nil+}+func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string, opts project.DetailsOptions) (project.Details, error) {proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)if err != nil {return project.Details{}, err}- projectsDir, _ := s.GetProjectsDirectory(ctx)+ projectsDir, projectsDirErr := s.GetProjectsDirectory(ctx)+ if projectsDirErr != nil {+ // Relative paths and the .env.global selection layer degrade without a+ // projects directory; keep the details response intact but log it.+ slog.WarnContext(ctx, "failed to resolve projects directory for project details", "projectID", projectID, "error", projectsDirErr)+ }var resp project.Detailsif err := mapper.MapStruct(proj, &resp); err != nil {@@ -233,13 +253,20 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.RunningCount = proj.RunningCountresp.Status = string(proj.Status)- if opts.IncludeComposeContent {- composeContent, _, overrideContent, _ := s.GetProjectContent(ctx, projectID)- resp.ComposeContent = composeContent- resp.OverrideContent = overrideContent- if overridePath := projects.DetectComposeOverrideFile(proj.Path); overridePath != "" {- resp.OverrideFileName = filepath.Base(overridePath)- }+ // COMPOSE_FILE in the project's .env selects the compose file set; when set,+ // `docker compose` skips auto-overrides and Arcane deploys exactly this list.+ // ComposeFiles is populated only for a multi-file selection. A broken+ // selection keeps the details response intact but logs the failure so the+ // configuration problem is diagnosable.+ composeSelection, selErr := projects.ComposeFileEnvSelection(ctx, projectsDir, proj.Path)+ if selErr != nil {+ slog.WarnContext(ctx, "failed to resolve COMPOSE_FILE selection for project details", "projectID", proj.ID, "path", proj.Path, "error", selErr)+ composeSelection = nil+ }+ resp.ComposeFiles = composeSelectionRelativePathsInternal(proj.Path, composeSelection)++ if err := s.populateDetailsComposeContentInternal(ctx, proj, opts, composeSelection, &resp); err != nil {+ return project.Details{}, err}if opts.IncludeEnvState {envState, err := projects.ReadProjectEnvState(proj.Path)@@ -294,6 +321,61 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringreturn resp, nil}+// composeSelectionRelativePathsInternal converts a multi-file COMPOSE_FILE+// selection (absolute paths) into ordered project-relative paths for the details+// DTO. It returns nil for a single-file or empty selection, where ComposeFileName+// is authoritative.+func composeSelectionRelativePathsInternal(projectPath string, selection []string) []string {+ if len(selection) <= 1 {+ return nil+ }+ rels := make([]string, 0, len(selection))+ for _, f := range selection {+ if rel, err := filepath.Rel(projectPath, f); err == nil {+ rels = append(rels, rel)+ } else {+ rels = append(rels, filepath.Base(f))+ }+ }+ return rels+}++// resolveDetailsOverrideInternal resolves the override file name and content for+// the details response. When a COMPOSE_FILE selection is active and does not+// include the override, it is suppressed so the UI does not invite edits that+// deploy would ignore.+func resolveDetailsOverrideInternal(projectPath, overrideContent string, composeSelection []string) (fileName, content string) {+ overridePath := projects.DetectComposeOverrideFile(projectPath)+ if suppressOverrideForComposeSelectionInternal(composeSelection, overridePath) {+ return "", ""+ }+ if overridePath != "" {+ fileName = filepath.Base(overridePath)+ }+ return fileName, overrideContent+}++// suppressOverrideForComposeSelectionInternal reports whether an Arcane-managed+// override should be hidden from the details response: a COMPOSE_FILE selection+// is active and does not list the detected override file (docker skips+// auto-overrides for an explicit file set). Paths are compared in full, not by+// base name, so a same-named file in a subdirectory does not count as the+// project-root override.+func suppressOverrideForComposeSelectionInternal(selection []string, overridePath string) bool {+ if len(selection) == 0 {+ return false+ }+ if overridePath == "" {+ return true+ }+ absOverride, err := filepath.Abs(filepath.Clean(overridePath))+ if err != nil {+ return true+ }+ // Selection entries are already absolute, cleaned paths.+ return !slices.Contains(selection, absOverride)+}+func buildProjectRuntimeServicesInternal(services []ProjectServiceInfo) []project.RuntimeService {runtimeServices := make([]project.RuntimeService, len(services))for i, svc := range services {diff --git a/backend/internal/project/project_listing.go b/backend/internal/project/project_listing.goindex 5584c88a6..7286dd28c 100644--- a/backend/internal/project/project_listing.go+++ b/backend/internal/project/project_listing.go@@ -97,7 +97,7 @@ func (s *ProjectService) countProjectFolders(ctx context.Context) (int, error) {return 0, nil}- discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(projectsDir, followProjectSymlinks, s.config.ProjectScanMaxDepth)+ discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(ctx, projectsDir, followProjectSymlinks, s.config.ProjectScanMaxDepth)if discoveryErr != nil {return 0, errors.WrapIff(discoveryErr, "failed to discover project directories in %s", projectsDir)}diff --git a/backend/internal/project/project_sync.go b/backend/internal/project/project_sync.goindex 7622036f5..72b28a29f 100644--- a/backend/internal/project/project_sync.go+++ b/backend/internal/project/project_sync.go@@ -152,7 +152,7 @@ func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {return nil}- discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(projectsDir, followProjectSymlinks, s.config.ProjectScanMaxDepth)+ discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(ctx, projectsDir, followProjectSymlinks, s.config.ProjectScanMaxDepth)if discoveryErr != nil {if os.IsNotExist(discoveryErr) {return nildiff --git a/backend/internal/project/project_update.go b/backend/internal/project/project_update.goindex 1cab8f547..002e3a748 100644--- a/backend/internal/project/project_update.go+++ b/backend/internal/project/project_update.go@@ -33,7 +33,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, nareturn nil, err}- name = resolveAuthoritativeProjectNameInternal(&proj, name, composeContent)+ name = resolveAuthoritativeProjectNameInternal(ctx, &proj, name, composeContent)renameRequested := isProjectRenameRequestedInternal(&proj, name)if err := s.recoverProjectRenameJournalForProjectInternal(ctx, projectID); err != nil {if renameRequested {@@ -45,7 +45,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, naif err != nil {return nil, err}- name = resolveAuthoritativeProjectNameInternal(&proj, name, composeContent)+ name = resolveAuthoritativeProjectNameInternal(ctx, &proj, name, composeContent)}if err := ensureProjectMutableInternal(&proj); err != nil {@@ -92,7 +92,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na// the compose file is authoritative over the submitted project name. For// name-only renames, it checks the compose file on disk so the lock can't be// bypassed via the API.-func resolveAuthoritativeProjectNameInternal(proj *Project, name *string, composeContent *string) *string {+func resolveAuthoritativeProjectNameInternal(ctx context.Context, proj *Project, name *string, composeContent *string) *string {if composeContent != nil {if yamlName := projects.ComposeContentProjectName(*composeContent); yamlName != "" {return &yamlName@@ -100,7 +100,7 @@ func resolveAuthoritativeProjectNameInternal(proj *Project, name *string, composreturn name}if name != nil {- if onDiskCompose, _, readErr := projects.ReadProjectFiles(proj.Path, ""); readErr == nil {+ if onDiskCompose, _, readErr := projects.ReadProjectFiles(ctx, proj.Path, ""); readErr == nil {if yamlName := projects.ComposeContentProjectName(onDiskCompose); yamlName != "" {return &yamlName}@@ -258,18 +258,21 @@ func (s *ProjectService) ApplyGitSyncProjectFiles(ctx context.Context, projectIDreturn nil, errors.WrapIf(err, "invalid compose file")}- if err := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, composeContent); err != nil {- return nil, errors.WrapIf(err, "failed to save compose file")- }- if err := persistGitSyncEnvFilesInternal(ctx, proj.Path, projectsDirectory, envUpdate); err != nil {- return nil, errors.WrapIf(err, "failed to sync git env files")- }- if err := projects.WriteComposeOverrideFile(ctx, projectsDirectory, proj.Path, gitOverrideContent, gitOverrideFileName); err != nil {- return nil, errors.WrapIf(err, "failed to sync git override file")+ backup, cleanupBackup, err := s.prepareProjectUpdateBackupInternal(ctx, projectsDirectory, proj.Path, &composeContent, gitEnvContent, gitOverrideContent)+ if err != nil {+ return nil, err}- if err := s.db.WithContext(ctx).Save(&proj).Error; err != nil {- return nil, errors.WrapIf(err, "failed to update project")+ defer cleanupBackup()++ journalActive := false+ projectStateCommitted := false+ if err := s.applyGitSyncProjectFilesInternal(ctx, &proj, projectsDirectory, composeContent, envUpdate, gitOverrideContent, gitOverrideFileName, &projectStateCommitted); err != nil {+ // A failure after the env persist would otherwise leave the project with+ // new env values and an old or partially updated compose file set.+ err = s.handleProjectUpdateFailureInternal(ctx, projectID, projectsDirectory, &proj, backup, &journalActive, projectStateCommitted, err)+ return nil, err}+s.refreshComposeProjectNameInternal(ctx, &proj)s.refreshProjectImageRefsInternal(ctx, &proj)if err := s.reconcileComposeTagsForProjectInternal(ctx, &proj); err != nil {@@ -297,6 +300,30 @@ func (s *ProjectService) ApplyGitSyncProjectFiles(ctx context.Context, projectIDreturn &proj, nil}+// applyGitSyncProjectFilesInternal persists the synced env, compose, and+// override files, then the project row. The env is persisted first so+// WriteComposeFile targets the COMPOSE_FILE base the updated .env selects, not+// the one the old .env selected. When it fails before the project row is saved,+// the caller restores the pre-update backup.+func (s *ProjectService) applyGitSyncProjectFilesInternal(ctx context.Context, proj *Project, projectsDirectory, composeContent string, envUpdate gitSyncEnvUpdateInternal, gitOverrideContent *string, gitOverrideFileName string, projectStateCommitted *bool) error {+ if err := persistGitSyncEnvFilesInternal(ctx, proj.Path, projectsDirectory, envUpdate); err != nil {+ return errors.WrapIf(err, "failed to sync git env files")+ }+ if err := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, composeContent); err != nil {+ return errors.WrapIf(err, "failed to save compose file")+ }+ if err := projects.WriteComposeOverrideFile(ctx, projectsDirectory, proj.Path, gitOverrideContent, gitOverrideFileName); err != nil {+ return errors.WrapIf(err, "failed to sync git override file")+ }+ if err := s.db.WithContext(ctx).Save(proj).Error; err != nil {+ return errors.WrapIf(err, "failed to update project")+ }+ if projectStateCommitted != nil {+ *projectStateCommitted = true+ }+ return nil+}+func (s *ProjectService) getProjectForUpdate(ctx context.Context, projectID string) (Project, string, error) {var proj Projectif err := s.db.WithContext(ctx).First(&proj, "id = ?", projectID).Error; err != nil {@@ -486,9 +513,10 @@ func (s *ProjectService) persistUpdatedProjectFiles(ctx context.Context, proj *Pif err := validateComposeContentForUpdate(ctx, projectsDirectory, proj.Path, proj.Name, *composeContent, effectiveEnvContent, valOverride, valOverrideName, false); err != nil {return errors.WrapIf(err, "invalid compose file")}- if err := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, *composeContent); err != nil {- return errors.WrapIf(err, "failed to save project files")- }+ // The env is persisted first so WriteComposeFile targets the COMPOSE_FILE+ // base the updated .env selects, not the one the old .env selected. A+ // non-nil composeContent is an explicit submission and is always written;+ // clients omit it when the compose editor is unchanged.if envContent != nil {if err := persistEffectiveEnvContentInternal(ctx, proj.Path, projectsDirectory, *envContent); err != nil {return errors.WrapIf(err, "failed to save project files")@@ -496,6 +524,9 @@ func (s *ProjectService) persistUpdatedProjectFiles(ctx context.Context, proj *P} else if err := s.ensureEffectiveEnvFileInternal(ctx, proj.Path, projectsDirectory); err != nil {return errors.WrapIf(err, "failed to save project files")}+ if err := projects.WriteComposeFile(ctx, projectsDirectory, proj.Path, *composeContent); err != nil {+ return errors.WrapIf(err, "failed to save project files")+ }if err := projects.ApplyOverrideFileChange(ctx, projectsDirectory, proj.Path, overrideContent); err != nil {return errors.WrapIf(err, "failed to save project files")}@@ -518,7 +549,7 @@ func (s *ProjectService) persistUpdatedProjectFiles(ctx context.Context, proj *P// *with* its override still validates, and a delete that would break the base// fails before touching disk.func (s *ProjectService) persistOverrideOnlyUpdateInternal(ctx context.Context, proj *Project, projectsDirectory string, envContent, overrideContent *string) error {- baseContent, _, err := projects.ReadProjectFiles(proj.Path, "")+ baseContent, _, err := projects.ReadProjectFiles(ctx, proj.Path, "")if err != nil {return errors.WrapIf(err, "failed to read project files")}@@ -548,27 +579,63 @@ func validateComposeContentForUpdate(ctx context.Context, projectsDirectory, pro}}()- fullEnvMap, envErr := projects.BuildValidationEnvironment(projectsDirectory, projectPath, effectiveEnvContent)+ fullEnvMap, envErr := projects.BuildValidationEnvironment(ctx, projectsDirectory, projectPath, effectiveEnvContent)if envErr != nil {return envErr}- validationProjectName := projects.NormalizeProjectName(projectName)- configFiles := []composetypes.ConfigFile{- {Filename: filepath.Join(projectPath, "compose.yaml"), Content: []byte(composeContent)},+ // COMPOSE_FILE in the (edited) env selects the exact file set, so validate+ // against it — a save that introduces a broken selection fails fast.+ envOpts, envOptsErr := projects.ParseComposeEnvOptions(projectPath, fullEnvMap)+ if envOptsErr != nil {+ return envOptsErr}- // When an override is supplied, validate the *merged* config as `docker- // compose` would deploy it. Overrides can add services and are layered on- // top (listed after the base so the override wins).- if overrideContent != nil {++ validationProjectName := projects.NormalizeProjectName(projectName)+ var configFiles []composetypes.ConfigFile+ switch {+ case len(envOpts.ConfigFiles) > 0:+ // The compose tab edits the base (first) file. Later entries are read+ // from disk; existence was already checked while parsing COMPOSE_FILE. An+ // Arcane-managed override lives in the project root and only applies when+ // that exact path is listed in the selection (docker skips auto-overrides+ // for an explicit file set); a same-named file in a subdirectory is not+ // the managed override.overrideName := strings.TrimSpace(overrideFileName)if overrideName == "" {overrideName = projects.DefaultComposeOverrideFileName}- configFiles = append(configFiles, composetypes.ConfigFile{- Filename: filepath.Join(projectPath, overrideName),- Content: []byte(*overrideContent),- })+ overridePath := ""+ if absProjectPath, absErr := filepath.Abs(filepath.Clean(projectPath)); absErr == nil {+ overridePath = filepath.Join(absProjectPath, overrideName)+ }+ for i, f := range envOpts.ConfigFiles {+ switch {+ case i == 0:+ configFiles = append(configFiles, composetypes.ConfigFile{Filename: f, Content: []byte(composeContent)})+ case overrideContent != nil && overridePath != "" && f == overridePath:+ configFiles = append(configFiles, composetypes.ConfigFile{Filename: f, Content: []byte(*overrideContent)})+ default:+ configFiles = append(configFiles, composetypes.ConfigFile{Filename: f})+ }+ }+ default:+ configFiles = []composetypes.ConfigFile{+ {Filename: filepath.Join(projectPath, "compose.yaml"), Content: []byte(composeContent)},+ }+ // When an override is supplied, validate the *merged* config as `docker+ // compose` would deploy it. Overrides can add services and are layered on+ // top (listed after the base so the override wins).+ if overrideContent != nil {+ overrideName := strings.TrimSpace(overrideFileName)+ if overrideName == "" {+ overrideName = projects.DefaultComposeOverrideFileName+ }+ configFiles = append(configFiles, composetypes.ConfigFile{+ Filename: filepath.Join(projectPath, overrideName),+ Content: []byte(*overrideContent),+ })+ }}cfg := composetypes.ConfigDetails{diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.goindex f052551c6..74015eaf3 100644--- a/backend/internal/project/service_test.go+++ b/backend/internal/project/service_test.go@@ -2055,6 +2055,159 @@ func TestProjectService_UpdateProject_AllowsMissingEnvFileDuringComposeValidatiorequire.NoError(t, statErr)}+func TestProjectService_UpdateProject_EnvRetargetWritesExplicitIdenticalComposeToSelectedBase(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ projectsDir := t.TempDir()+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)++ settingsService, err := newSettingsServiceForTestInternal(t, ctx, db)+ require.NoError(t, err)++ eventService := event.NewEventService(db, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load())++ dirName := "retarget-explicit"+ projectPath := filepath.Join(projectsDir, dirName)+ require.NoError(t, os.MkdirAll(projectPath, 0o755))++ baseContent := "services:\n base:\n image: nginx:alpine\n"+ altContent := "services:\n alt:\n image: busybox:latest\n"+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte(baseContent), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "alt.yaml"), []byte(altContent), 0o644))++ project := &Project{+ ID: "proj-retarget-explicit",+ Name: dirName,+ DirName: &dirName,+ Path: projectPath,+ Status: ProjectStatusStopped,+ }+ require.NoError(t, db.Create(project).Error)++ // An explicit composeContent is authoritative even when it is+ // byte-identical to the previous base: the caller intends the retargeted+ // base to carry this content.+ explicitCompose := baseContent+ _, err = svc.UpdateProject(ctx, project.ID, nil, &explicitCompose, new("COMPOSE_FILE=alt.yaml\n"), nil, common.User{+ ID: "u1",+ Username: "tester",+ })+ require.NoError(t, err)++ altOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "alt.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, baseContent, string(altOnDisk), "an explicit submission must be written to the newly selected base")++ baseOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "compose.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, baseContent, string(baseOnDisk))++ envOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, ".env"))+ require.NoError(t, readErr)+ assert.Contains(t, string(envOnDisk), "COMPOSE_FILE=alt.yaml")+}++func TestProjectService_UpdateProject_EnvRetargetWithoutComposePayloadPreservesNewBase(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ projectsDir := t.TempDir()+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)++ settingsService, err := newSettingsServiceForTestInternal(t, ctx, db)+ require.NoError(t, err)++ eventService := event.NewEventService(db, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load())++ dirName := "retarget-omit"+ projectPath := filepath.Join(projectsDir, dirName)+ require.NoError(t, os.MkdirAll(projectPath, 0o755))++ baseContent := "services:\n base:\n image: nginx:alpine\n"+ altContent := "services:\n alt:\n image: busybox:latest\n"+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte(baseContent), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "alt.yaml"), []byte(altContent), 0o644))++ project := &Project{+ ID: "proj-retarget-omit",+ Name: dirName,+ DirName: &dirName,+ Path: projectPath,+ Status: ProjectStatusStopped,+ }+ require.NoError(t, db.Create(project).Error)++ // Clients omit composeContent when the compose editor is unchanged: an+ // env-only retarget must switch the selection without touching either file.+ _, err = svc.UpdateProject(ctx, project.ID, nil, nil, new("COMPOSE_FILE=alt.yaml\n"), nil, common.User{+ ID: "u1",+ Username: "tester",+ })+ require.NoError(t, err)++ altOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "alt.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, altContent, string(altOnDisk), "the newly selected base must keep its own content")++ baseOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "compose.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, baseContent, string(baseOnDisk))++ envOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, ".env"))+ require.NoError(t, readErr)+ assert.Contains(t, string(envOnDisk), "COMPOSE_FILE=alt.yaml")+}++func TestProjectService_UpdateProject_EnvRetargetWritesEditedComposeToSelectedBase(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ projectsDir := t.TempDir()+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)++ settingsService, err := newSettingsServiceForTestInternal(t, ctx, db)+ require.NoError(t, err)++ eventService := event.NewEventService(db, nil, nil)+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil, nil, nil, config.Load())++ dirName := "retarget-edit"+ projectPath := filepath.Join(projectsDir, dirName)+ require.NoError(t, os.MkdirAll(projectPath, 0o755))++ baseContent := "services:\n base:\n image: nginx:alpine\n"+ altContent := "services:\n alt:\n image: busybox:latest\n"+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte(baseContent), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "alt.yaml"), []byte(altContent), 0o644))++ project := &Project{+ ID: "proj-retarget-edit",+ Name: dirName,+ DirName: &dirName,+ Path: projectPath,+ Status: ProjectStatusStopped,+ }+ require.NoError(t, db.Create(project).Error)++ editedCompose := "services:\n alt:\n image: redis:alpine\n"+ _, err = svc.UpdateProject(ctx, project.ID, nil, &editedCompose, new("COMPOSE_FILE=alt.yaml\n"), nil, common.User{+ ID: "u1",+ Username: "tester",+ })+ require.NoError(t, err)++ altOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "alt.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, editedCompose, string(altOnDisk), "an edited compose must be written to the newly selected base")++ baseOnDisk, readErr := os.ReadFile(filepath.Join(projectPath, "compose.yaml"))+ require.NoError(t, readErr)+ assert.Equal(t, baseContent, string(baseOnDisk))+}+func TestProjectService_UpdateProject_AllowsMissingLocalIncludeDuringComposeValidation(t *testing.T) {db := setupProjectTestDB(t)ctx := context.Background()diff --git a/backend/internal/template/service.go b/backend/internal/template/service.goindex 2781871fc..7242eca8b 100644--- a/backend/internal/template/service.go+++ b/backend/internal/template/service.go@@ -364,7 +364,7 @@ func (s *TemplateService) DeleteTemplate(ctx context.Context, id string) error {templatePath := filepath.Join(baseDir, existing.Name)if entry, err := acfs.Stat(ctx, baseDir, "/"+existing.Name, false); err == nil && entry.IsDirectory {- if _, err := projects.DetectComposeFile(templatePath); err == nil {+ if _, err := projects.DetectComposeFile(ctx, "", templatePath); err == nil {if err := acfs.RemoveAll(ctx, baseDir, entry.Path); err != nil {return errors.WrapIf(err, "failed to delete template directory")}@@ -1067,7 +1067,7 @@ func (s *TemplateService) upsertFilesystemTemplate(ctx context.Context, name, de}func (s *TemplateService) processFolderEntry(ctx context.Context, baseDir, folder string) error {- compose, envPtr, desc, found, err := projects.ReadFolderComposeTemplate(baseDir, folder)+ compose, envPtr, desc, found, err := projects.ReadFolderComposeTemplate(ctx, baseDir, folder)if err != nil || !found {return err}diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.goindex 84e19acd5..e1bbe628a 100644--- a/backend/pkg/projects/cmds.go+++ b/backend/pkg/projects/cmds.go@@ -86,18 +86,27 @@ func ComposeUp(ctx context.Context, proj *types.Project, services []string, remoprompt = compose.AlwaysOkPrompt()}- c, err := NewClient(composeCtx, "", authConfigs, prompt)+ // COMPOSE_* deployment variables ride on the loaded project's environment.+ // Selection errors were already surfaced at load, so parse best-effort here.+ envOpts, _ := ParseComposeEnvOptions(proj.WorkingDir, EnvMap(proj.Environment))++ var clientOptions []composeClientOptionInternal+ if envOpts.ParallelLimit > 0 {+ clientOptions = append(clientOptions, withComposeServiceOptionsInternal(compose.WithMaxConcurrency(envOpts.ParallelLimit)))+ }++ c, err := NewClient(composeCtx, "", authConfigs, prompt, clientOptions...)if err != nil {return err}defer func() { _ = c.Close() }()- upOptions, startOptions := composeUpOptions(proj, services, removeOrphans, forceRecreate, waitTimeout)+ upOptions, startOptions := composeUpOptions(proj, services, removeOrphans, forceRecreate, waitTimeout, envOpts)return c.svc.Up(composeCtx, proj, api.UpOptions{Create: upOptions, Start: startOptions})}-func composeUpOptions(proj *types.Project, services []string, removeOrphans bool, forceRecreate bool, waitTimeout time.Duration) (api.CreateOptions, api.StartOptions) {+func composeUpOptions(proj *types.Project, services []string, removeOrphans bool, forceRecreate bool, waitTimeout time.Duration, envOpts ComposeEnvOptions) (api.CreateOptions, api.StartOptions) {recreatePolicy := api.RecreateDivergedif forceRecreate {recreatePolicy = api.RecreateForce@@ -107,7 +116,9 @@ func composeUpOptions(proj *types.Project, services []string, removeOrphans boolServices: services,Recreate: recreatePolicy,RecreateDependencies: api.RecreateDiverged,- RemoveOrphans: removeOrphans,+ // A caller opt-in (or GitOps-forced true) still wins over COMPOSE_REMOVE_ORPHANS.+ RemoveOrphans: removeOrphans || envOpts.RemoveOrphans,+ IgnoreOrphans: envOpts.IgnoreOrphans,}startOptions := api.StartOptions{diff --git a/backend/pkg/projects/cmds_test.go b/backend/pkg/projects/cmds_test.goindex 7dc275e52..29549af24 100644--- a/backend/pkg/projects/cmds_test.go+++ b/backend/pkg/projects/cmds_test.go@@ -101,25 +101,31 @@ func TestComposeUpOptions_RemoveOrphans(t *testing.T) {proj := &composetypes.Project{Name: "test"}t.Run("removeOrphans true propagates to CreateOptions", func(t *testing.T) {- upOptions, _ := composeUpOptions(proj, nil, true, false, 0)+ upOptions, _ := composeUpOptions(proj, nil, true, false, 0, ComposeEnvOptions{})require.True(t, upOptions.RemoveOrphans)})t.Run("removeOrphans false leaves CreateOptions disabled", func(t *testing.T) {- upOptions, _ := composeUpOptions(proj, nil, false, false, 0)+ upOptions, _ := composeUpOptions(proj, nil, false, false, 0, ComposeEnvOptions{})require.False(t, upOptions.RemoveOrphans)})t.Run("removeOrphans is independent of forceRecreate", func(t *testing.T) {// forceRecreate drives the Recreate policy, not RemoveOrphans.- upOptions, _ := composeUpOptions(proj, nil, true, true, 0)+ upOptions, _ := composeUpOptions(proj, nil, true, true, 0, ComposeEnvOptions{})require.True(t, upOptions.RemoveOrphans)require.Equal(t, api.RecreateForce, upOptions.Recreate)- upOptions, _ = composeUpOptions(proj, nil, false, true, 0)+ upOptions, _ = composeUpOptions(proj, nil, false, true, 0, ComposeEnvOptions{})require.False(t, upOptions.RemoveOrphans)require.Equal(t, api.RecreateForce, upOptions.Recreate)})++ t.Run("COMPOSE_REMOVE_ORPHANS / COMPOSE_IGNORE_ORPHANS propagate", func(t *testing.T) {+ upOptions, _ := composeUpOptions(proj, nil, false, false, 0, ComposeEnvOptions{RemoveOrphans: true, IgnoreOrphans: true})+ require.True(t, upOptions.RemoveOrphans)+ require.True(t, upOptions.IgnoreOrphans)+ })}func TestListGlobalComposeContainersUsesProvidedClient(t *testing.T) {diff --git a/backend/pkg/projects/compose.go b/backend/pkg/projects/compose.goindex 1fd4bc6bb..959bcb363 100644--- a/backend/pkg/projects/compose.go+++ b/backend/pkg/projects/compose.go@@ -5,7 +5,6 @@ import ("io""log/slog""maps"- "slices""strings""sync""sync/atomic"@@ -29,18 +28,34 @@ type Client struct {logWriter io.WriteCloser}-// composeClientOptionInternal selects internal wiring variants for one-shot-// compose clients.-type composeClientOptionInternal uint8+type composeClientConfigInternal struct {+ isLogDemuxEnabled bool+ serviceOptions []compose.Option+}++type composeClientOptionInternal func(*composeClientConfigInternal)// streamDemuxedLogsInternal wires the log-parity wrapper so non-TTY container// log responses keep stderr metadata as Arcane's [STDERR] marker.-const streamDemuxedLogsInternal composeClientOptionInternal = 1+func streamDemuxedLogsInternal(config *composeClientConfigInternal) {+ config.isLogDemuxEnabled = true+}++func withComposeServiceOptionsInternal(options ...compose.Option) composeClientOptionInternal {+ return func(config *composeClientConfigInternal) {+ config.serviceOptions = append(config.serviceOptions, options...)+ }+}// NewClient builds a compose client. dockerHost, when non-empty, pins the// docker CLI to that daemon endpoint instead of letting it resolve one from// the environment.func NewClient(ctx context.Context, dockerHost string, authConfigs map[string]registry.AuthConfig, prompt compose.Prompt, options ...composeClientOptionInternal) (*Client, error) {+ config := composeClientConfigInternal{}+ for _, option := range options {+ option(&config)+ }+cli, err := command.NewDockerCli()if err != nil {return nil, err@@ -61,7 +76,7 @@ func NewClient(ctx context.Context, dockerHost string, authConfigs map[string]re}composeCLI := wrapDockerCLIWithInspectCompatibilityInternal(cli)- if slices.Contains(options, streamDemuxedLogsInternal) {+ if config.isLogDemuxEnabled {composeCLI = wrapDockerCLIWithLogsDemuxInternal(cli)}@@ -96,6 +111,7 @@ func NewClient(ctx context.Context, dockerHost string, authConfigs map[string]recompose.WithErrorStream(logWriter),)}+ serviceOptions = append(serviceOptions, config.serviceOptions...)svc, err := compose.NewComposeService(composeCLI, serviceOptions...)if err != nil {diff --git a/backend/pkg/projects/compose_env.go b/backend/pkg/projects/compose_env.gonew file mode 100644index 000000000..188f87d6d--- /dev/null+++ b/backend/pkg/projects/compose_env.go@@ -0,0 +1,253 @@+package projects++import (+ "context"+ "log/slog"+ "maps"+ "os"+ "path/filepath"+ "strconv"+ "strings"++ "emperror.dev/errors"++ "github.com/compose-spec/compose-go/v2/consts"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+)++// Docker Compose pre-defined variable names that compose-go's consts package+// does not export. See https://docs.docker.com/compose/how-tos/environment-variables/envvars.+const (+ composeEnvFilesKey = "COMPOSE_ENV_FILES"+ composeRemoveOrphansKey = "COMPOSE_REMOVE_ORPHANS"+ composeIgnoreOrphansKey = "COMPOSE_IGNORE_ORPHANS"+ composeParallelLimitKey = "COMPOSE_PARALLEL_LIMIT"++ defaultComposePathSeparator = ":"+)++// ComposeEnvOptions holds the deployment-relevant Docker Compose pre-defined+// environment variables parsed from a project's merged environment.+type ComposeEnvOptions struct {+ // ConfigFiles is the resolved, absolute COMPOSE_FILE selection in order (the+ // first entry is the base file). Nil when COMPOSE_FILE is unset.+ ConfigFiles []string+ // Profiles is the COMPOSE_PROFILES selection.+ Profiles []string+ // ProjectName is COMPOSE_PROJECT_NAME (not normalized).+ ProjectName string+ // EnvFiles is the resolved, absolute COMPOSE_ENV_FILES selection in order.+ EnvFiles []string+ // RemoveOrphans is COMPOSE_REMOVE_ORPHANS.+ RemoveOrphans bool+ // IgnoreOrphans is COMPOSE_IGNORE_ORPHANS.+ IgnoreOrphans bool+ // ParallelLimit is COMPOSE_PARALLEL_LIMIT; 0 means unset.+ ParallelLimit int+}++// ParseComposeEnvOptions extracts the deployment-relevant COMPOSE_* variables+// from an already-merged environment map. Malformed path selections return a+// classified common.ErrComposeFileEnvInvalid; malformed scalars are ignored+// with a debug log, matching `docker compose`'s tolerance.+func ParseComposeEnvOptions(workdir string, env EnvMap) (ComposeEnvOptions, error) {+ opts := ComposeEnvOptions{+ ProjectName: strings.TrimSpace(env[consts.ComposeProjectName]),+ }++ files, err := resolveComposeFileSelectionInternal(workdir, env)+ if err != nil {+ return ComposeEnvOptions{}, err+ }+ opts.ConfigFiles = files++ if raw := strings.TrimSpace(env[consts.ComposeProfiles]); raw != "" {+ opts.Profiles = splitAndTrimInternal(raw, ",")+ }++ for _, entry := range ComposeEnvFileEntriesFromEnv(env) {+ resolved, resErr := ResolvePathWithinDir(workdir, entry)+ if resErr != nil {+ return ComposeEnvOptions{}, common.Classify(common.ErrComposeFileEnvInvalid, errors.WrapIff(resErr, "COMPOSE_ENV_FILES entry %q", entry))+ }+ opts.EnvFiles = append(opts.EnvFiles, resolved)+ }++ opts.RemoveOrphans = parseComposeBoolInternal(env, composeRemoveOrphansKey)+ opts.IgnoreOrphans = parseComposeBoolInternal(env, composeIgnoreOrphansKey)++ if raw := strings.TrimSpace(env[composeParallelLimitKey]); raw != "" {+ if n, convErr := strconv.Atoi(raw); convErr == nil && n > 0 {+ opts.ParallelLimit = n+ } else {+ slog.Debug("ignoring invalid COMPOSE_PARALLEL_LIMIT", "value", raw)+ }+ }++ return opts, nil+}++// ComposeFileEnvSelection resolves the COMPOSE_FILE selection for dir with the+// same layering EnvLoader.LoadEnvironment uses at deployment: .env.global from+// projectsDir first, the project .env on top, then any COMPOSE_ENV_FILES+// entries. Returns nil when the merged environment does not set COMPOSE_FILE.+// COMPOSE_DISABLE_ENV_FILE (declared in .env.global) skips the project .env, as+// `docker compose` does; a global COMPOSE_FILE still applies. An empty+// projectsDir skips the global layer.+func ComposeFileEnvSelection(ctx context.Context, projectsDir, dir string) ([]string, error) {+ envMap := make(EnvMap)+ if strings.TrimSpace(projectsDir) != "" {+ globalEnv, err := ParseProjectEnvFile(filepath.Join(projectsDir, GlobalEnvFileName), envMap)+ if err != nil {+ return nil, err+ }+ maps.Copy(envMap, globalEnv)+ }++ // COMPOSE_DISABLE_ENV_FILE skips the project .env; it is read only from the+ // sources merged so far (.env.global), matching LoadEnvironment.+ if !parseComposeBoolInternal(envMap, consts.ComposeDisableDefaultEnvFile) {+ projectEnv, err := ParseProjectEnvFile(filepath.Join(dir, EffectiveEnvFileName), envMap)+ if err != nil {+ return nil, err+ }+ maps.Copy(envMap, projectEnv)+ }+ if len(envMap) == 0 {+ return nil, nil+ }+ mergeComposeEnvFilesInternal(ctx, dir, envMap, ParseProjectEnvFile, nil)+ return resolveComposeFileSelectionInternal(dir, envMap)+}++// ComposeFileEntriesFromEnv returns the raw COMPOSE_FILE entries declared in env+// (split on COMPOSE_PATH_SEPARATOR, ":" by default), or nil when unset. Entries+// are not resolved, validated, or stat'd.+func ComposeFileEntriesFromEnv(env EnvMap) []string {+ raw, ok := env[consts.ComposeFilePath]+ if !ok || strings.TrimSpace(raw) == "" {+ return nil+ }++ separator := defaultComposePathSeparator+ if custom := strings.TrimSpace(env[consts.ComposePathSeparator]); custom != "" {+ separator = custom+ }++ return splitAndTrimInternal(raw, separator)+}++// ComposeEnvFileEntriesFromEnv returns the raw COMPOSE_ENV_FILES entries+// declared in env (comma-separated), or nil when unset. Entries are not+// resolved, validated, or stat'd.+func ComposeEnvFileEntriesFromEnv(env EnvMap) []string {+ raw := strings.TrimSpace(env[composeEnvFilesKey])+ if raw == "" {+ return nil+ }+ return splitAndTrimInternal(raw, ",")+}++// resolveComposeFileSelectionInternal parses COMPOSE_FILE from env into an+// ordered list of absolute compose-file paths, or nil when COMPOSE_FILE is+// unset. Every entry must be a relative path to an existing file within+// workdir; the first entry (the base file) must sit directly in workdir.+func resolveComposeFileSelectionInternal(workdir string, env EnvMap) ([]string, error) {+ entries := ComposeFileEntriesFromEnv(env)+ if len(entries) == 0 {+ return nil, nil+ }++ absWorkdir, err := filepath.Abs(filepath.Clean(workdir))+ if err != nil {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.WrapIf(err, "resolve project directory"))+ }++ files := make([]string, 0, len(entries))+ for i, entry := range entries {+ if filepath.IsAbs(entry) {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.Errorf("COMPOSE_FILE entry %q must be relative to the project directory", entry))+ }++ resolved, resErr := ResolvePathWithinDir(absWorkdir, entry)+ if resErr != nil {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.WrapIff(resErr, "COMPOSE_FILE entry %q", entry))+ }++ if i == 0 && filepath.Dir(resolved) != absWorkdir {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.Errorf("the first COMPOSE_FILE entry %q must be in the project directory", entry))+ }++ // os.Stat rather than acfs: compose files may be symlinks resolving+ // outside any confinement root, and workdir can be an imported project+ // living outside the projects directory.+ info, statErr := os.Stat(resolved)+ if statErr != nil {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.WrapIff(statErr, "COMPOSE_FILE entry %q", entry))+ }+ if info.IsDir() {+ return nil, common.Classify(common.ErrComposeFileEnvInvalid, errors.Errorf("COMPOSE_FILE entry %q is a directory", entry))+ }++ files = append(files, resolved)+ }++ return files, nil+}++// mergeComposeEnvFilesInternal merges each COMPOSE_ENV_FILES entry (in order,+// later wins) on top of envMap; bad entries are warned and skipped. Unlike+// `docker compose`, the entries are additive on top of the project .env rather+// than a replacement: .env is Arcane's managed effective env file and the place+// COMPOSE_ENV_FILES itself is declared, so replacing it would be self-defeating.+func mergeComposeEnvFilesInternal(ctx context.Context, workdir string, envMap EnvMap, parse func(path string, contextEnv EnvMap) (EnvMap, error), onMerged func(values EnvMap)) {+ for _, entry := range ComposeEnvFileEntriesFromEnv(envMap) {+ resolved, err := ResolvePathWithinDir(workdir, entry)+ if err != nil {+ slog.WarnContext(ctx, "skipping COMPOSE_ENV_FILES entry outside project directory", "entry", entry, "error", err)+ continue+ }+ // os.Stat rather than acfs: env files may be symlinks resolving outside+ // any confinement root (a supported setup).+ if _, statErr := os.Stat(resolved); statErr != nil {+ slog.WarnContext(ctx, "COMPOSE_ENV_FILES entry not found", "path", resolved, "error", statErr)+ continue+ }+ values, err := parse(resolved, envMap)+ if err != nil {+ slog.WarnContext(ctx, "failed to load COMPOSE_ENV_FILES entry", "path", resolved, "error", err)+ continue+ }+ if len(values) == 0 {+ continue+ }+ maps.Copy(envMap, values)+ if onMerged != nil {+ onMerged(values)+ }+ }+}++func splitAndTrimInternal(raw, sep string) []string {+ parts := strings.Split(raw, sep)+ out := make([]string, 0, len(parts))+ for _, p := range parts {+ if trimmed := strings.TrimSpace(p); trimmed != "" {+ out = append(out, trimmed)+ }+ }+ return out+}++func parseComposeBoolInternal(env EnvMap, key string) bool {+ raw := strings.TrimSpace(env[key])+ if raw == "" {+ return false+ }+ v, err := strconv.ParseBool(raw)+ if err != nil {+ slog.Debug("ignoring invalid compose boolean env var", "key", key, "value", raw)+ return false+ }+ return v+}diff --git a/backend/pkg/projects/compose_env_test.go b/backend/pkg/projects/compose_env_test.gonew file mode 100644index 000000000..c78170f85--- /dev/null+++ b/backend/pkg/projects/compose_env_test.go@@ -0,0 +1,185 @@+package projects++import (+ "os"+ "path/filepath"+ "testing"++ "emperror.dev/errors"++ "github.com/getarcaneapp/arcane/backend/v2/internal/common"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func TestParseComposeEnvOptions(t *testing.T) {+ t.Parallel()++ dir := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.MkdirAll(filepath.Join(dir, "sub"), 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "sub", "extra.yml"), []byte("services: {}\n"), 0o600))++ t.Run("scalars, profiles split, and custom separator", func(t *testing.T) {+ t.Parallel()+ env := EnvMap{+ "COMPOSE_FILE": "base.yml;sub/extra.yml",+ "COMPOSE_PATH_SEPARATOR": ";",+ "COMPOSE_PROFILES": "frontend, debug",+ "COMPOSE_PROJECT_NAME": "myproj",+ "COMPOSE_REMOVE_ORPHANS": "true",+ "COMPOSE_IGNORE_ORPHANS": "1",+ "COMPOSE_PARALLEL_LIMIT": "4",+ }++ opts, err := ParseComposeEnvOptions(dir, env)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml"), filepath.Join(dir, "sub", "extra.yml")}, opts.ConfigFiles)+ assert.Equal(t, []string{"frontend", "debug"}, opts.Profiles)+ assert.Equal(t, "myproj", opts.ProjectName)+ assert.True(t, opts.RemoveOrphans)+ assert.True(t, opts.IgnoreOrphans)+ assert.Equal(t, 4, opts.ParallelLimit)+ })++ t.Run("invalid scalars are ignored", func(t *testing.T) {+ t.Parallel()+ opts, err := ParseComposeEnvOptions(dir, EnvMap{+ "COMPOSE_REMOVE_ORPHANS": "nope",+ "COMPOSE_PARALLEL_LIMIT": "-3",+ })+ require.NoError(t, err)+ assert.False(t, opts.RemoveOrphans)+ assert.Zero(t, opts.ParallelLimit)+ })++ t.Run("COMPOSE_ENV_FILES resolved in order, traversal rejected", func(t *testing.T) {+ t.Parallel()+ opts, err := ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_ENV_FILES": "sub/extra.env, .env.local"})+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "sub", "extra.env"), filepath.Join(dir, ".env.local")}, opts.EnvFiles)++ _, err = ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_ENV_FILES": "../outside.env"})+ require.Error(t, err)+ assert.True(t, errors.Is(err, common.ErrComposeFileEnvInvalid))+ })++ t.Run("absolute entry rejected", func(t *testing.T) {+ t.Parallel()+ _, err := ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_FILE": filepath.Join(dir, "base.yml")})+ require.Error(t, err)+ assert.True(t, errors.Is(err, common.ErrComposeFileEnvInvalid))+ })++ t.Run("escaping entry rejected", func(t *testing.T) {+ t.Parallel()+ _, err := ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_FILE": "../base.yml"})+ require.Error(t, err)+ assert.True(t, errors.Is(err, common.ErrComposeFileEnvInvalid))+ })++ t.Run("non-root first entry rejected", func(t *testing.T) {+ t.Parallel()+ _, err := ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_FILE": "sub/extra.yml:base.yml"})+ require.Error(t, err)+ assert.True(t, errors.Is(err, common.ErrComposeFileEnvInvalid))+ })++ t.Run("missing entry rejected", func(t *testing.T) {+ t.Parallel()+ _, err := ParseComposeEnvOptions(dir, EnvMap{"COMPOSE_FILE": "base.yml:sub/missing.yml"})+ require.Error(t, err)+ assert.True(t, errors.Is(err, common.ErrComposeFileEnvInvalid))+ })+}++func TestComposeFileEnvSelection(t *testing.T) {+ t.Parallel()++ t.Run("nil when no .env", func(t *testing.T) {+ t.Parallel()+ files, err := ComposeFileEnvSelection(t.Context(), "", t.TempDir())+ require.NoError(t, err)+ assert.Nil(t, files)+ })++ t.Run("resolves COMPOSE_FILE from .env", func(t *testing.T) {+ t.Parallel()+ dir := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "extra.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_FILE=base.yml:extra.yml\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), "", dir)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml"), filepath.Join(dir, "extra.yml")}, files)+ })++ t.Run("resolves COMPOSE_FILE from COMPOSE_ENV_FILES entry", func(t *testing.T) {+ t.Parallel()+ dir := t.TempDir()+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "aux.env"), []byte("COMPOSE_FILE=base.yml\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_ENV_FILES=aux.env\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), "", dir)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml")}, files)+ })++ t.Run("global COMPOSE_DISABLE_ENV_FILE skips project .env", func(t *testing.T) {+ t.Parallel()+ projectsDir := t.TempDir()+ dir := filepath.Join(projectsDir, "proj")+ require.NoError(t, os.MkdirAll(dir, 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(projectsDir, GlobalEnvFileName), []byte("COMPOSE_DISABLE_ENV_FILE=true\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_FILE=base.yml\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), projectsDir, dir)+ require.NoError(t, err)+ assert.Nil(t, files)+ })++ t.Run("global COMPOSE_FILE selects the base when the project .env is silent", func(t *testing.T) {+ t.Parallel()+ projectsDir := t.TempDir()+ dir := filepath.Join(projectsDir, "proj")+ require.NoError(t, os.MkdirAll(dir, 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(projectsDir, GlobalEnvFileName), []byte("COMPOSE_FILE=base.yml\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), projectsDir, dir)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml")}, files)+ })++ t.Run("project .env COMPOSE_FILE overrides the global value", func(t *testing.T) {+ t.Parallel()+ projectsDir := t.TempDir()+ dir := filepath.Join(projectsDir, "proj")+ require.NoError(t, os.MkdirAll(dir, 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(projectsDir, GlobalEnvFileName), []byte("COMPOSE_FILE=global.yml\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "global.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_FILE=base.yml\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), projectsDir, dir)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml")}, files)+ })++ t.Run("COMPOSE_DISABLE_ENV_FILE still honors a global COMPOSE_FILE", func(t *testing.T) {+ t.Parallel()+ projectsDir := t.TempDir()+ dir := filepath.Join(projectsDir, "proj")+ require.NoError(t, os.MkdirAll(dir, 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(projectsDir, GlobalEnvFileName), []byte("COMPOSE_DISABLE_ENV_FILE=true\nCOMPOSE_FILE=base.yml\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, "base.yml"), []byte("services: {}\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_FILE=other.yml\n"), 0o600))++ files, err := ComposeFileEnvSelection(t.Context(), projectsDir, dir)+ require.NoError(t, err)+ assert.Equal(t, []string{filepath.Join(dir, "base.yml")}, files)+ })+}diff --git a/backend/pkg/projects/discovery.go b/backend/pkg/projects/discovery.goindex 407cd77f1..6ba672955 100644--- a/backend/pkg/projects/discovery.go+++ b/backend/pkg/projects/discovery.go@@ -1,6 +1,7 @@package projectsimport (+ "context""log/slog""os""path/filepath"@@ -67,7 +68,7 @@ func IsProjectDirectoryPath(path string, followSymlinks bool) (bool, error) {return resolvedInfo.IsDir(), nil}-func DiscoverProjectDirectories(root string, followSymlinks bool, maxDepth int) ([]DiscoveredProjectDir, error) {+func DiscoverProjectDirectories(ctx context.Context, root string, followSymlinks bool, maxDepth int) ([]DiscoveredProjectDir, error) {root = filepath.Clean(root)isDir, err := IsProjectDirectoryPath(root, followSymlinks)@@ -79,7 +80,7 @@ func DiscoverProjectDirectories(root string, followSymlinks bool, maxDepth int)ancestors := make(map[string]struct{})if err == nil {- err = walkProjectDirectoriesInternal(root, true, 0, maxDepth, followSymlinks, ancestors, &discovered)+ err = walkProjectDirectoriesInternal(ctx, root, root, true, 0, maxDepth, followSymlinks, ancestors, &discovered)}if err != nil {// The process runs as the PUID/PGID runtime user (default 65532) even@@ -98,7 +99,7 @@ func DiscoverProjectDirectories(root string, followSymlinks bool, maxDepth int)return discovered, nil}-func walkProjectDirectoriesInternal(path string, isRoot bool, currentDepth int, maxDepth int, followSymlinks bool, ancestors map[string]struct{}, discovered *[]DiscoveredProjectDir) error {+func walkProjectDirectoriesInternal(ctx context.Context, root, path string, isRoot bool, currentDepth int, maxDepth int, followSymlinks bool, ancestors map[string]struct{}, discovered *[]DiscoveredProjectDir) error {if !isRoot {name := filepath.Base(path)if IsInternalScratchDirName(name) || IsFilesystemSnapshotDirName(name) {@@ -129,7 +130,7 @@ func walkProjectDirectoriesInternal(path string, isRoot bool, currentDepth int,// The projects root directory itself is exempt — we always descend into it// so siblings under the root are all discovered, even if the root happens// to contain its own compose file.- if _, err := DetectComposeFile(path); err == nil {+ if _, err := DetectComposeFile(ctx, root, path); err == nil {*discovered = append(*discovered, DiscoveredProjectDir{DirName: filepath.Base(path),Path: path,@@ -158,7 +159,7 @@ func walkProjectDirectoriesInternal(path string, isRoot bool, currentDepth int,continue}- if err := walkProjectDirectoriesInternal(childPath, false, currentDepth+1, maxDepth, followSymlinks, ancestors, discovered); err != nil {+ if err := walkProjectDirectoriesInternal(ctx, root, childPath, false, currentDepth+1, maxDepth, followSymlinks, ancestors, discovered); err != nil {return err}}diff --git a/backend/pkg/projects/discovery_test.go b/backend/pkg/projects/discovery_test.goindex ba30e8a07..a6080a64a 100644--- a/backend/pkg/projects/discovery_test.go+++ b/backend/pkg/projects/discovery_test.go@@ -41,7 +41,7 @@ func TestDiscoverProjectDirectories_StopsDescentAtCompose(t *testing.T) {writeComposeFileInternal(t, filepath.Join(root, "networking", "adguardhome"))writeComposeFileInternal(t, filepath.Join(root, "networking", "nginx-proxy-manager"))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)names := discoveredNamesInternal(discovered)@@ -58,7 +58,7 @@ func TestDiscoverProjectDirectories_SiblingProjectsAtRoot(t *testing.T) {writeComposeFileInternal(t, filepath.Join(root, "app1"))writeComposeFileInternal(t, filepath.Join(root, "app2"))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)names := discoveredNamesInternal(discovered)@@ -98,7 +98,7 @@ func TestDiscoverProjectDirectories_NestedStandaloneProject(t *testing.T) {// root/sub/nested/compose.yml (no compose file at root/sub/)writeComposeFileInternal(t, filepath.Join(root, "sub", "nested"))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)names := discoveredNamesInternal(discovered)@@ -111,7 +111,7 @@ func TestDiscoverProjectDirectories_SupportsCustomComposeFilename(t *testing.T)require.NoError(t, os.MkdirAll(projectDir, 0o755))require.NoError(t, os.WriteFile(filepath.Join(projectDir, "radarr.yaml"), []byte("services: {}\n"), 0o644))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)require.Len(t, discovered, 1)require.Equal(t, "Radarr-3", discovered[0].DirName)@@ -122,7 +122,7 @@ func TestDiscoverProjectDirectories_SupportsCustomComposeFilename(t *testing.T)// err-check boilerplate.func discoverProjectDirectoriesInternal(t *testing.T, root string) []DiscoveredProjectDir {t.Helper()- d, err := DiscoverProjectDirectories(root, false, 0)+ d, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)return d}@@ -133,7 +133,7 @@ func TestDiscoverProjectDirectories_RespectsMaxDepth(t *testing.T) {writeComposeFileInternal(t, filepath.Join(root, "top-level"))writeComposeFileInternal(t, filepath.Join(root, "group", "nested"))- discovered, err := DiscoverProjectDirectories(root, false, 1)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 1)require.NoError(t, err)names := discoveredNamesInternal(discovered)@@ -145,7 +145,7 @@ func TestDiscoverProjectDirectories_UnlimitedDepthStillFindsNestedProject(t *teswriteComposeFileInternal(t, filepath.Join(root, "group", "nested"))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)names := discoveredNamesInternal(discovered)@@ -232,7 +232,7 @@ func TestDiscoverProjectDirectories_SkipsUnreadableNestedSibling(t *testing.T) {t.Cleanup(func() { _ = os.Chmod(unreadableDir, 0o700) })require.NoError(t, os.Chmod(unreadableDir, 0))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err, "discovery must not fail when only a nested, non-root directory is unreadable")// os.ReadDir returns entries sorted, so "adguard-cheetah" is walked before@@ -254,7 +254,7 @@ func TestDiscoverProjectDirectories_SkipsFilesystemSnapshotDirs(t *testing.T) {writeComposeFileInternal(t, filepath.Join(root, "#recycle", "arcane"))writeComposeFileInternal(t, filepath.Join(root, ".snapshots", "1", "arcane"))- discovered, err := DiscoverProjectDirectories(root, false, 0)+ discovered, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.NoError(t, err)assert.Equal(t, []string{"arcane"}, discoveredNamesInternal(discovered))}diff --git a/backend/pkg/projects/env.go b/backend/pkg/projects/env.goindex 8ba8af31d..86a9aba1b 100644--- a/backend/pkg/projects/env.go+++ b/backend/pkg/projects/env.go@@ -16,6 +16,7 @@ import ("emperror.dev/errors"+ "github.com/compose-spec/compose-go/v2/consts""github.com/compose-spec/compose-go/v2/dotenv""github.com/samber/hot""go.getarcane.app/acfs"@@ -118,18 +119,50 @@ func (l *EnvLoader) LoadEnvironment(ctx context.Context) (envMap EnvMap, injecti}}- projectEnvPath := filepath.Join(l.workdir, EffectiveEnvFileName)- if err := l.loadAndMergeProjectEnv(ctx, projectEnvPath, envMap, injectionVars); err != nil {- if errors.Is(err, os.ErrNotExist) {- slog.DebugContext(ctx, "Project .env file does not exist", "path", projectEnvPath)- } else {- slog.WarnContext(ctx, "Failed to load project env", "path", projectEnvPath, "error", err)+ // COMPOSE_DISABLE_ENV_FILE skips the project .env entirely, as `docker+ // compose` does. It is read from the sources merged so far — in practice+ // only .env.global, since the process-env allowlist never includes+ // COMPOSE_* variables.+ if parseComposeBoolInternal(envMap, consts.ComposeDisableDefaultEnvFile) {+ slog.DebugContext(ctx, "COMPOSE_DISABLE_ENV_FILE set; skipping project .env", "workdir", l.workdir)+ } else {+ projectEnvPath := filepath.Join(l.workdir, EffectiveEnvFileName)+ if err := l.loadAndMergeProjectEnv(ctx, projectEnvPath, envMap, injectionVars); err != nil {+ if errors.Is(err, os.ErrNotExist) {+ slog.DebugContext(ctx, "Project .env file does not exist", "path", projectEnvPath)+ } else {+ slog.WarnContext(ctx, "Failed to load project env", "path", projectEnvPath, "error", err)+ }}}+ // COMPOSE_ENV_FILES, when declared, layers additional env files on top of+ // the project .env (later entries win). Reuses the mtime-keyed cache.+ l.mergeComposeEnvFilesInternal(ctx, envMap, injectionVars)+return envMap, injectionVars, nil}+func (l *EnvLoader) mergeComposeEnvFilesInternal(ctx context.Context, envMap, injectionVars EnvMap) {+ parse := func(path string, contextEnv EnvMap) (EnvMap, error) {+ key := strings.Join([]string{path, l.projectsDir, strconv.FormatBool(l.autoInjectEnv), envContextFingerprintInternal(contextEnv)}, "\x00")+ entry, err := loadCachedEnvFileInternal(ctx, projectEnvFileCache, key, path, contextEnv)+ if err != nil {+ return nil, err+ }+ if !entry.exists {+ return nil, nil+ }+ return entry.values, nil+ }+ onMerged := func(values EnvMap) {+ if l.autoInjectEnv {+ maps.Copy(injectionVars, values)+ }+ }+ mergeComposeEnvFilesInternal(ctx, l.workdir, envMap, parse, onMerged)+}+func (l *EnvLoader) loadAndMergeGlobalEnv(ctx context.Context, path string, envMap, injectionVars EnvMap) error {entry, err := loadCachedEnvFileInternal(ctx, globalEnvFileCache, path, path, envMap)if err != nil {diff --git a/backend/pkg/projects/env_validation.go b/backend/pkg/projects/env_validation.goindex 0f0883c5a..904135edc 100644--- a/backend/pkg/projects/env_validation.go+++ b/backend/pkg/projects/env_validation.go@@ -1,19 +1,21 @@package projectsimport (+ "context""maps""os""path/filepath""strings""emperror.dev/errors"+ "github.com/compose-spec/compose-go/v2/consts""github.com/compose-spec/compose-go/v2/dotenv")// BuildValidationEnvironment resolves the env a compose file is validated// against. It matches the project-visible env sources without inheriting the// Arcane process environment, which may contain unrelated secrets.-func BuildValidationEnvironment(projectsDirectory, projectPath string, effectiveEnvContent *string) (EnvMap, error) {+func BuildValidationEnvironment(ctx context.Context, projectsDirectory, projectPath string, effectiveEnvContent *string) (EnvMap, error) {fullEnvMap := make(EnvMap)if absWorkdir, absErr := filepath.Abs(projectPath); absErr == nil {fullEnvMap["PWD"] = absWorkdir@@ -28,21 +30,25 @@ func BuildValidationEnvironment(projectsDirectory, projectPath string, effective}maps.Copy(fullEnvMap, globalEnv)- if effectiveEnvContent != nil {- projectEnv, err := ParseValidationEnvContent(*effectiveEnvContent, fullEnvMap)- if err != nil {- return nil, errors.WrapIf(err, "parse provided env content")+ // Mirror LoadEnvironment's COMPOSE_DISABLE_ENV_FILE / COMPOSE_ENV_FILES+ // handling so the validation env matches the runtime env exactly.+ if !parseComposeBoolInternal(fullEnvMap, consts.ComposeDisableDefaultEnvFile) {+ if effectiveEnvContent != nil {+ projectEnv, err := ParseValidationEnvContent(*effectiveEnvContent, fullEnvMap)+ if err != nil {+ return nil, errors.WrapIf(err, "parse provided env content")+ }+ maps.Copy(fullEnvMap, projectEnv)+ } else {+ projectEnv, err := ParseValidationEnvFile(filepath.Join(projectPath, ".env"), fullEnvMap)+ if err != nil {+ return nil, errors.WrapIf(err, "parse project env file")+ }+ maps.Copy(fullEnvMap, projectEnv)}- maps.Copy(fullEnvMap, projectEnv)- return fullEnvMap, nil}- projectEnvPath := filepath.Join(projectPath, ".env")- projectEnv, err := ParseValidationEnvFile(projectEnvPath, fullEnvMap)- if err != nil {- return nil, errors.WrapIf(err, "parse project env file")- }- maps.Copy(fullEnvMap, projectEnv)+ mergeComposeEnvFilesInternal(ctx, projectPath, fullEnvMap, ParseValidationEnvFile, nil)return fullEnvMap, nil}diff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.goindex 0e7a22cae..b7ec968ed 100644--- a/backend/pkg/projects/fs_templates.go+++ b/backend/pkg/projects/fs_templates.go@@ -16,9 +16,9 @@ import (// ReadFolderComposeTemplate stays on os.* for its reads: template folders are// user-managed on disk, so compose/env files may be symlinks resolving outside// any confinement root, which acfs cannot follow.-func ReadFolderComposeTemplate(baseDir, folder string) (string, *string, string, bool, error) {+func ReadFolderComposeTemplate(ctx context.Context, baseDir, folder string) (string, *string, string, bool, error) {folderPath := filepath.Join(baseDir, folder)- composePath, err := DetectComposeFile(folderPath)+ composePath, err := DetectComposeFile(ctx, "", folderPath)if err != nil {if errors.Is(err, common.ErrComposeFileNotFound) {return "", nil, "", false, nildiff --git a/backend/pkg/projects/fs_templates_test.go b/backend/pkg/projects/fs_templates_test.goindex f37d441cb..9140979bf 100644--- a/backend/pkg/projects/fs_templates_test.go+++ b/backend/pkg/projects/fs_templates_test.go@@ -33,7 +33,7 @@ func TestReadFolderComposeTemplate_DetectsAllVariants(t *testing.T) {require.NoError(t, os.MkdirAll(folderPath, 0o755))require.NoError(t, os.WriteFile(filepath.Join(folderPath, tc.fileName), []byte(composeContent), 0o600))- content, env, desc, found, err := ReadFolderComposeTemplate(baseDir, folder)+ content, env, desc, found, err := ReadFolderComposeTemplate(t.Context(), baseDir, folder)require.NoError(t, err)require.True(t, found, "expected template to be detected for %s", tc.fileName)assert.Equal(t, composeContent, content)@@ -53,7 +53,7 @@ func TestReadFolderComposeTemplate_ReadsEnvExample(t *testing.T) {require.NoError(t, os.WriteFile(filepath.Join(folderPath, "compose.yml"), []byte("services: {}\n"), 0o600))require.NoError(t, os.WriteFile(filepath.Join(folderPath, ".env.example"), []byte("KEY=value\n"), 0o600))- _, env, _, found, err := ReadFolderComposeTemplate(baseDir, folder)+ _, env, _, found, err := ReadFolderComposeTemplate(t.Context(), baseDir, folder)require.NoError(t, err)require.True(t, found)require.NotNil(t, env)diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex de65d2759..9c9d7f82c 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -13,6 +13,7 @@ import ("emperror.dev/errors"+ "github.com/getarcaneapp/arcane/backend/v2/internal/common""github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/samber/mo"@@ -104,15 +105,21 @@ func isBackendModuleRoot(path string) bool {// ReadProjectFiles stays on os.*: compose and env files may be symlinks// resolving outside any confinement root, and projectPath can be an imported// project outside the projects directory; acfs cannot follow either.-func ReadProjectFiles(projectPath, composePath string) (composeContent, envContent string, err error) {+func ReadProjectFiles(ctx context.Context, projectPath, composePath string) (composeContent, envContent string, err error) {if strings.TrimSpace(composePath) == "" {- composePath, _ = DetectComposeFile(projectPath)+ detected, derr := DetectComposeFile(ctx, "", projectPath)+ if derr != nil && !errors.Is(derr, common.ErrComposeFileNotFound) {+ return "", "", derr+ }+ composePath = detected}if strings.TrimSpace(composePath) != "" {- if content, rerr := os.ReadFile(composePath); rerr == nil {- composeContent = string(content)+ content, rerr := os.ReadFile(composePath)+ if rerr != nil {+ return "", "", errors.WrapIff(rerr, "failed to read compose file %s", composePath)}+ composeContent = string(content)}envPath := filepath.Join(projectPath, ".env")diff --git a/backend/pkg/projects/fs_util_test.go b/backend/pkg/projects/fs_util_test.goindex fc2643da6..bab82fb62 100644--- a/backend/pkg/projects/fs_util_test.go+++ b/backend/pkg/projects/fs_util_test.go@@ -87,7 +87,7 @@ func TestReadProjectFiles(t *testing.T) {require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n app:\n image: nginx:alpine\n"), 0o644))require.NoError(t, os.WriteFile(filepath.Join(projectPath, ".env"), []byte("TZ=UTC\n"), 0o644))- composeContent, envContent, err := ReadProjectFiles(projectPath, "")+ composeContent, envContent, err := ReadProjectFiles(t.Context(), projectPath, "")require.NoError(t, err)assert.Contains(t, composeContent, "services:")assert.Equal(t, "TZ=UTC\n", envContent)@@ -98,7 +98,7 @@ func TestReadProjectFiles(t *testing.T) {require.NoError(t, os.WriteFile(filepath.Join(projectPath, "radarr.yaml"), []byte("services:\n app:\n image: lscr.io/linuxserver/radarr:latest\n"), 0o644))require.NoError(t, os.WriteFile(filepath.Join(projectPath, ".env"), []byte("TZ=UTC\n"), 0o644))- composeContent, envContent, err := ReadProjectFiles(projectPath, filepath.Join(projectPath, "radarr.yaml"))+ composeContent, envContent, err := ReadProjectFiles(t.Context(), projectPath, filepath.Join(projectPath, "radarr.yaml"))require.NoError(t, err)assert.Contains(t, composeContent, "radarr")assert.Equal(t, "TZ=UTC\n", envContent)diff --git a/backend/pkg/projects/fs_util_unix_test.go b/backend/pkg/projects/fs_util_unix_test.goindex ec402141e..e0ea8b848 100644--- a/backend/pkg/projects/fs_util_unix_test.go+++ b/backend/pkg/projects/fs_util_unix_test.go@@ -19,7 +19,7 @@ func TestDiscoverProjectDirectories_UnreadableRootErrorIsActionable(t *testing.Trequire.NoError(t, os.Chmod(root, 0o000))t.Cleanup(func() { _ = os.Chmod(root, 0o755) })- _, err := DiscoverProjectDirectories(root, false, 0)+ _, err := DiscoverProjectDirectories(t.Context(), root, false, 0)require.Error(t, err)// The bare "permission denied" must be wrapped with the runtime identity// and remediation hints (#3489).diff --git a/backend/pkg/projects/fs_writer.go b/backend/pkg/projects/fs_writer.goindex f9933e173..1ca648909 100644--- a/backend/pkg/projects/fs_writer.go+++ b/backend/pkg/projects/fs_writer.go@@ -44,8 +44,8 @@ func ComposeFileCandidates() []string {}// detectExistingComposeFileInternal finds an existing compose file in the directory-func detectExistingComposeFileInternal(dir string) string {- composePath, err := DetectComposeFile(dir)+func detectExistingComposeFileInternal(ctx context.Context, projectsRoot, dir string) string {+ composePath, err := DetectComposeFile(ctx, projectsRoot, dir)if err == nil {return composePath}@@ -68,7 +68,7 @@ func WriteComposeFile(ctx context.Context, projectsRoot, dirPath, content string}composeFileName := DefaultComposeFileName- if existingFile := detectExistingComposeFileInternal(dirPath); existingFile != "" {+ if existingFile := detectExistingComposeFileInternal(ctx, projectsRoot, dirPath); existingFile != "" {composeFileName = filepath.Base(existingFile)}diff --git a/backend/pkg/projects/load.go b/backend/pkg/projects/load.goindex 58b8fa70e..bd418765c 100644--- a/backend/pkg/projects/load.go+++ b/backend/pkg/projects/load.go@@ -66,7 +66,17 @@ func stripTrailingProjectCounterInternal(name string) string {return withoutDigits[:len(withoutDigits)-1]}-func DetectComposeFile(dir string) (string, error) {+// DetectComposeFile returns the base compose file for dir. COMPOSE_FILE in the+// project's .env takes precedence over standard detection, mirroring `docker+// compose`; projectsDir locates .env.global for the COMPOSE_DISABLE_ENV_FILE+// check and may be empty where no projects directory applies.+func DetectComposeFile(ctx context.Context, projectsDir, dir string) (string, error) {+ if files, err := ComposeFileEnvSelection(ctx, projectsDir, dir); err != nil {+ return "", err+ } else if len(files) > 0 {+ return files[0], nil+ }+// Stays on os.*: compose files may be symlinks resolving outside any// confinement root, and dir itself can be an imported project living// outside the projects directory; acfs cannot follow either.@@ -350,20 +360,39 @@ func LoadComposeProject(slog.WarnContext(ctx, "Failed to set PWD environment variable", "workdir", workdir, "error", absErr)}- // Pass full environment to compose-go for interpolation, compose-go will use this for ${VAR} expansion in the compose file- configFiles := []composetypes.ConfigFile{- {Filename: composeFile},+ // Deployment-relevant COMPOSE_* variables (COMPOSE_FILE, COMPOSE_PROFILES,+ // COMPOSE_PROJECT_NAME) come from the merged project environment.+ envOpts, envOptsErr := ParseComposeEnvOptions(workdir, fullEnvMap)+ if envOptsErr != nil {+ return nil, envOptsErr}- // Merge a Docker Compose override file (compose.override.yaml, etc.) when- // present alongside the base file, as `docker compose` does. Only auto-load an- // override when the base was discovered by its standard filename: `docker- // compose` never auto-loads overrides for an explicit custom `-f` file, and- // our custom-YAML fallback scan (e.g. mystack.yaml) is that case. Listing the- // override after the base makes it take precedence.- if slices.Contains(composeFileCandidates, filepath.Base(composeFile)) {- if overrideFile := DetectComposeOverrideFile(workdir); overrideFile != "" {- configFiles = append(configFiles, composetypes.ConfigFile{Filename: overrideFile})- slog.DebugContext(ctx, "merging compose override file", "base", composeFile, "override", overrideFile)++ // Pass full environment to compose-go for interpolation, compose-go will use this for ${VAR} expansion in the compose file+ var configFiles []composetypes.ConfigFile+ switch {+ case len(envOpts.ConfigFiles) > 0:+ // COMPOSE_FILE selects the exact file set (first entry is the base, later+ // entries merge over it). As `docker compose` does for an explicit `-f`,+ // no override file is auto-loaded.+ for _, f := range envOpts.ConfigFiles {+ configFiles = append(configFiles, composetypes.ConfigFile{Filename: f})+ }+ if !slices.Contains(envOpts.ConfigFiles, composeFile) {+ slog.DebugContext(ctx, "COMPOSE_FILE selection supersedes resolved compose file", "resolved", composeFile, "selection", envOpts.ConfigFiles)+ }+ default:+ configFiles = []composetypes.ConfigFile{{Filename: composeFile}}+ // Merge a Docker Compose override file (compose.override.yaml, etc.) when+ // present alongside the base file, as `docker compose` does. Only auto-load an+ // override when the base was discovered by its standard filename: `docker+ // compose` never auto-loads overrides for an explicit custom `-f` file, and+ // our custom-YAML fallback scan (e.g. mystack.yaml) is that case. Listing the+ // override after the base makes it take precedence.+ if slices.Contains(composeFileCandidates, filepath.Base(composeFile)) {+ if overrideFile := DetectComposeOverrideFile(workdir); overrideFile != "" {+ configFiles = append(configFiles, composetypes.ConfigFile{Filename: overrideFile})+ slog.DebugContext(ctx, "merging compose override file", "base", composeFile, "override", overrideFile)+ }}}@@ -375,8 +404,17 @@ func LoadComposeProject(}loaderOptions := []func(*loader.Options){func(opts *loader.Options) {- if projectName != "" {+ // A caller-supplied name acts like `docker compose -p`, which outranks+ // COMPOSE_PROJECT_NAME. Only when no name is forced (e.g. the sync+ // metadata path passes "") does COMPOSE_PROJECT_NAME take effect.+ switch {+ case projectName != "":opts.SetProjectName(projectName, false)+ case envOpts.ProjectName != "":+ opts.SetProjectName(loader.NormalizeProjectName(envOpts.ProjectName), true)+ }+ if len(envOpts.Profiles) > 0 {+ loader.WithProfiles(envOpts.Profiles)(opts)}// Discard env_file after folding into environment, as the compose CLI// does, so config-hashes match and both tools stop recreating services.@@ -540,7 +578,7 @@ func injectServiceConfiguration(project *composetypes.Project, injectionVars Env}func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDirectory string, autoInjectEnv bool, pathMapper *PathMapper) (*composetypes.Project, string, error) {- composeFile, err := DetectComposeFile(dir)+ composeFile, err := DetectComposeFile(ctx, projectsDirectory, dir)if err != nil {return nil, "", err}diff --git a/backend/pkg/projects/load_test.go b/backend/pkg/projects/load_test.goindex 268270c41..35f970ed1 100644--- a/backend/pkg/projects/load_test.go+++ b/backend/pkg/projects/load_test.go@@ -34,7 +34,7 @@ func TestDetectComposeFile_SupportsPodmanComposeNames(t *testing.T) {expectedPath := filepath.Join(dir, tc.fileName)require.NoError(t, os.WriteFile(expectedPath, []byte(composeContent), 0o600))- composePath, err := DetectComposeFile(dir)+ composePath, err := DetectComposeFile(t.Context(), "", dir)require.NoError(t, err)assert.Equal(t, expectedPath, composePath)})@@ -48,7 +48,7 @@ func TestDetectComposeFile_SupportsSingleCustomComposeName(t *testing.T) {expectedPath := filepath.Join(dir, "radarr.yaml")require.NoError(t, os.WriteFile(expectedPath, []byte("services:\n app:\n image: nginx:alpine\n"), 0o600))- composePath, err := DetectComposeFile(dir)+ composePath, err := DetectComposeFile(t.Context(), "", dir)require.NoError(t, err)assert.Equal(t, expectedPath, composePath)}@@ -63,7 +63,7 @@ func TestDetectComposeFile_PrefersDirectoryMatchedCustomComposeName(t *testing.Trequire.NoError(t, os.WriteFile(expectedPath, []byte("services:\n app:\n image: nginx:alpine\n"), 0o600))require.NoError(t, os.WriteFile(filepath.Join(dir, "config.yaml"), []byte("x-extra: true\n"), 0o600))- composePath, err := DetectComposeFile(dir)+ composePath, err := DetectComposeFile(t.Context(), "", dir)require.NoError(t, err)assert.Equal(t, expectedPath, composePath)}@@ -75,7 +75,7 @@ func TestDetectComposeFile_ReturnsErrorForAmbiguousCustomComposeNames(t *testingrequire.NoError(t, os.WriteFile(filepath.Join(dir, "alpha.yaml"), []byte("services:\n a:\n image: nginx:alpine\n"), 0o600))require.NoError(t, os.WriteFile(filepath.Join(dir, "beta.yml"), []byte("services:\n b:\n image: busybox:latest\n"), 0o600))- _, err := DetectComposeFile(dir)+ _, err := DetectComposeFile(t.Context(), "", dir)require.Error(t, err)assert.Contains(t, err.Error(), "multiple custom compose files")}@@ -86,7 +86,7 @@ func TestDetectComposeFile_IgnoresSingleNonComposeYaml(t *testing.T) {dir := t.TempDir()require.NoError(t, os.WriteFile(filepath.Join(dir, "values.yaml"), []byte("replicaCount: 2\nimage:\n tag: latest\n"), 0o600))- _, err := DetectComposeFile(dir)+ _, err := DetectComposeFile(t.Context(), "", dir)require.Error(t, err)assert.Contains(t, err.Error(), "no compose file found")}@@ -127,7 +127,7 @@ func TestDetectComposeFile_ReturnsBaseNotOverride(t *testing.T) {require.NoError(t, os.WriteFile(basePath, []byte("services:\n app:\n image: nginx:alpine\n"), 0o600))require.NoError(t, os.WriteFile(filepath.Join(dir, "compose.override.yaml"), []byte("services:\n app:\n image: busybox:latest\n"), 0o600))- detected, err := DetectComposeFile(dir)+ detected, err := DetectComposeFile(t.Context(), "", dir)require.NoError(t, err)assert.Equal(t, basePath, detected)}@@ -138,7 +138,7 @@ func TestDetectComposeFile_IgnoresOverrideOnlyDirectory(t *testing.T) {dir := t.TempDir()require.NoError(t, os.WriteFile(filepath.Join(dir, "compose.override.yaml"), []byte("services:\n app:\n image: busybox:latest\n"), 0o600))- _, err := DetectComposeFile(dir)+ _, err := DetectComposeFile(t.Context(), "", dir)require.Error(t, err)}@@ -162,6 +162,29 @@ func TestLoadComposeProject_MergesComposeOverrideFile(t *testing.T) {assert.Equal(t, []string{basePath, overridePath}, project.ComposeFiles)}+func TestLoadComposeProject_ComposeFileEnvSelectsFilesAndSkipsOverride(t *testing.T) {+ t.Parallel()++ dir := t.TempDir()+ basePath := filepath.Join(dir, "base.yml")+ require.NoError(t, os.MkdirAll(filepath.Join(dir, "sub"), 0o755))+ extraPath := filepath.Join(dir, "sub", "extra.yml")+ require.NoError(t, os.WriteFile(basePath, []byte("services:\n app:\n image: nginx:alpine\n"), 0o600))+ require.NoError(t, os.WriteFile(extraPath, []byte("services:\n worker:\n image: busybox:latest\n"), 0o600))+ // A standard override on disk must NOT be auto-merged when COMPOSE_FILE is set.+ require.NoError(t, os.WriteFile(filepath.Join(dir, "compose.override.yaml"), []byte("services:\n app:\n image: alpine:3\n"), 0o600))+ require.NoError(t, os.WriteFile(filepath.Join(dir, ".env"), []byte("COMPOSE_FILE=base.yml:sub/extra.yml\n"), 0o600))++ project, err := LoadComposeProject(context.Background(), basePath, "demo", dir, false, nil, nil, nil, false)+ require.NoError(t, err)+ require.NotNil(t, project)++ assert.Contains(t, project.Services, "app")+ assert.Contains(t, project.Services, "worker")+ assert.Equal(t, "nginx:alpine", project.Services["app"].Image, "override must not be merged when COMPOSE_FILE is set")+ assert.Equal(t, []string{basePath, extraPath}, project.ComposeFiles)+}+func TestLoadComposeProject_ArcaneProcessEnvInterpolation(t *testing.T) {// Arcane's own env (e.g. PORT) must not leak into compose interpolation of// managed projects: ${PORT:-8191} falls back to its default (issue #3499).diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 833375f5b..44d5f176e 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1327,6 +1327,8 @@"compose_override_hint": "Overrides are merged on top of the compose file at deploy. Clear the content and save to remove the override file.","compose_override_add": "Add override file","compose_override_remove": "Remove override",+ "compose_multiple_files_title": "Multiple compose files",+ "compose_multiple_files_description": "This project deploys the compose files below, selected by COMPOSE_FILE in its .env. Files other than the base are edited in the Workspace view.","compose_no_services_found": "No services found for this project","compose_service_not_created": "Not created","compose_name_change_not_allowed": "Project name cannot be changed while running. Please stop the project first.",diff --git a/frontend/src/lib/types/swarm.ts b/frontend/src/lib/types/swarm.tsindex 575fd4970..988363f56 100644--- a/frontend/src/lib/types/swarm.ts+++ b/frontend/src/lib/types/swarm.ts@@ -631,6 +631,7 @@ export interface Project {runtimeServices?: RuntimeService[];composeContent?: string;composeFileName?: string;+ composeFiles?: string[];overrideContent?: string;overrideFileName?: string;envContent?: string;diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelteindex cd051464c..4ec54d3f2 100644--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte@@ -283,6 +283,7 @@// read-only the paths the sync itself owns.let canEditProjectWorkspace = $derived(canUpdateProject && !project?.isArchived);let composeFileName = $derived(project?.composeFileName || 'compose.yaml');+ let composeFiles = $derived(project?.composeFiles ?? []);// Set when the user opts to add an override to a project that has none yet.let overrideEditorRequested = $state(false);// The backend only sets overrideFileName when an override file exists on disk.@@ -732,7 +733,9 @@const { composeContent, envContent, overrideContent } = validated;const namePayload = isGitOpsManaged ? undefined : effectiveName;- const composePayload = isGitOpsManaged ? undefined : composeContent;+ // Only send the compose when the editor is dirty: an unchanged echo would+ // be written to whatever base the retargeted COMPOSE_FILE selects.+ const composePayload = isGitOpsManaged || !composeHasChanges ? undefined : composeContent;const envPayload = envContent !== serverEnvContent ? envContent : undefined;// Blank override => delete, which the backend treats as a no-op when none// exists, so we can always send it (except for read-only GitOps projects).@@ -1615,6 +1618,20 @@</div></Alert.Root>{/if}+ {#if composeFiles.length > 1}+ <Alert.Root variant="default" class="mb-4">+ <AlertIcon class="size-4" />+ <Alert.Title>{m.compose_multiple_files_title()}</Alert.Title>+ <Alert.Description>+ {m.compose_multiple_files_description()}+ <div class="mt-2 flex flex-wrap gap-1.5">+ {#each composeFiles as file, i (i)}+ <span class="rounded bg-muted px-1.5 py-0.5 font-mono text-xs">{file}</span>+ {/each}+ </div>+ </Alert.Description>+ </Alert.Root>+ {/if}<div class="mb-2 flex shrink-0 items-center justify-end gap-2"><labelfor="layout-mode-toggle"diff --git a/go.work.sum b/go.work.sumindex 0f6b5a353..57cde482d 100644--- a/go.work.sum+++ b/go.work.sum@@ -62,6 +62,9 @@ cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=+charm.land/bubbles/v2 v2.1.1/go.mod h1:GE6M31gaWZVXzGw73OeuTTgy4lX+OtkH0E5ymnNsHxo=+charm.land/bubbletea/v2 v2.0.8/go.mod h1:2SkdgoTXluXJHOUwAoRlRXF/28vklb1rFl6GcgV1/ss=+charm.land/lipgloss/v2 v2.0.5/go.mod h1:9oqhxt4yxIMe6q5A4kHr44DremZk7J9UNh74GlWa5nc=cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=@@ -360,6 +363,8 @@ codeberg.org/go-latex/latex v0.1.0 h1:hoGO86rIbWVyjtlDLzCqZPjNykpWQ9YuTZqAzPcfL3codeberg.org/go-latex/latex v0.1.0/go.mod h1:LA0q/AyWIYrqVd+A9Upkgsb+IqPcmSTKc9Dny04MHMw=codeberg.org/go-pdf/fpdf v0.10.0 h1:u+w669foDDx5Ds43mpiiayp40Ov6sZalgcPMDBcZRd4=codeberg.org/go-pdf/fpdf v0.10.0/go.mod h1:Y0DGRAdZ0OmnZPvjbMp/1bYxmIPxm0ws4tfoPOc4LjU=+connectrpc.com/connect v1.19.2 h1:McQ83FGdzL+t60peksi0gXC7MQ/iLKgLduAnThbM0mo=+connectrpc.com/connect v1.19.2/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=connectrpc.com/otelconnect v0.7.2 h1:WlnwFzaW64dN06JXU+hREPUGeEzpz3Acz2ACOmN8cMI=connectrpc.com/otelconnect v0.7.2/go.mod h1:JS7XUKfuJs2adhCnXhNHPHLz6oAaZniCJdSF00OZSew=connectrpc.com/otelconnect v0.9.0 h1:NggB3pzRC3pukQWaYbRHJulxuXvmCKCKkQ9hbrHAWoA=@@ -608,6 +613,8 @@ github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cegithub.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=github.com/aws/aws-sdk-go-v2 v1.42.0/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg=github.com/aws/aws-sdk-go-v2 v1.43.0/go.mod h1:5pKeft2eJj+gElQ38Jqg4ibCqh+/AK33/0X3hip7IjM=+github.com/aws/aws-sdk-go-v2 v1.43.6 h1:RrmFcqCBxkJuf7g1axVo5krB4jM/AO8r5e5oujrgdoQ=+github.com/aws/aws-sdk-go-v2 v1.43.6/go.mod h1:tXpPM+v0D1lndmga+HqqLDIzUFJlEeR21aspVklHF00=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=@@ -616,6 +623,7 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaXgithub.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 h1:zWFmPmgw4sveAYi1mRqG+E/g0461cJ5M4bJ8/nc6d3Q=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5/go.mod h1:nVUlMLVV8ycXSb7mSkcNu9e3v/1TJq2RTlrPwhYWr5c=+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 h1:3IZY0XAJquT3aHzbkHfPzy4ACPcEjVG0x87KOwtpqGY=github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14/go.mod h1:zwM6veDkhGgQFqkBy+uT28AAYpLu+uFMlPl+rCg/73E=github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco=github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE=@@ -625,6 +633,8 @@ github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTegithub.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY=github.com/aws/aws-sdk-go-v2/config v1.32.24/go.mod h1:yZtrGKJGlqfEW+/m2uTsJK+Jz7xF5R0eZfgcIG9m1ss=github.com/aws/aws-sdk-go-v2/config v1.32.31/go.mod h1:PN0NYDCCoOpGGsZ2+elDUidmHfQBPyYzN2GCgl8HEBs=+github.com/aws/aws-sdk-go-v2/config v1.32.37 h1:Ljl7LOJB6ym0liuEl0+TZ3d7f5I8MEZN1Cj9PINlj/g=+github.com/aws/aws-sdk-go-v2/config v1.32.37/go.mod h1:WJ7pe7ZPpmG8Q5kKS53zeypIV4FBGACxmte8Uc6SgUc=github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg=github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc=github.com/aws/aws-sdk-go-v2/credentials v1.18.24 h1:iJ2FmPT35EaIB0+kMa6TnQ+PwG5A1prEdAw+PsMzfHg=@@ -633,6 +643,8 @@ github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTgithub.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw=github.com/aws/aws-sdk-go-v2/credentials v1.19.23/go.mod h1:VsJF2ropPB37gDr7M2rLSpCE8IQWdpl62uae7qxZmqU=github.com/aws/aws-sdk-go-v2/credentials v1.19.30/go.mod h1:jKxAp2AEncnliinzpgOSZDFv6+VjvWhjw/AtbfsWT9U=+github.com/aws/aws-sdk-go-v2/credentials v1.19.36 h1:84s5xMme6ENYEdKG8rsbSFFg/8+lbHBeM9QYSO0gnDk=+github.com/aws/aws-sdk-go-v2/credentials v1.19.36/go.mod h1:c46BLdagDLIswjgt+GeQOslXgeS0E6wCacs5yZbxPGk=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk=@@ -641,6 +653,8 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcgithub.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29/go.mod h1:QRnaRcTVGKPGRy8w78HMQtKUGRYcnMZAANATkeVA6Mo=github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.31/go.mod h1:nWfRNDAppujCQgOUd43lKT4yeLv9z3nJ3bw1G3BgQKo=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.37 h1:b5tb+CZItBkydC7r3hTNdSO3pszG1R2EtnA+7TePQPk=+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.37/go.mod h1:ZQ+6SU9X0oz6+7MUCSswv9Mjci4eaqZr21HI2RVy/yA=github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY=github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g=github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.12 h1:Zy6Tme1AA13kX8x3CnkHx5cqdGWGaj/anwOiWGnA0Xo=@@ -657,6 +671,8 @@ github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsgithub.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ=github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc=github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.31/go.mod h1:aVyUoytEyOViR6jhq6jula0xkc5NfBE2hgeF6BvOrao=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.37 h1:lznzIOvvbqjfe8UAaciCRJgBgJsxuTROKlhZuXQWfv8=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.37/go.mod h1:otfkzyfQeMMLZAqX59GSXTL3o22BR/l6HFaRzzbWSqA=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 h1:HBSI2kDkMdWz4ZM7FjwE7e/pWDEZ+nR95x8Ztet1ooY=@@ -665,6 +681,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1vgithub.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA=github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.31/go.mod h1:OERqI9k0draSLB8O8woxY3q25ZWTELRK4RRoLMuMZFo=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.37 h1:zCEORWo0eU0gDjG+IyApE/2B+ZGG1m+GU7B263XV8ds=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.37/go.mod h1:i6c0PEl3TNOWxRbQ++KQcVenPWS/GoQeiklKhNuqzJ8=github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=@@ -677,12 +695,16 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 h1:itu4KHu8JK/N6NcLIISlf3LL1Lcgithub.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12/go.mod h1:i+6vTU3xziikTY3vcox23X8pPGW5X3wVgd1VZ7ha+x8=github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30/go.mod h1:AS0HycUvJRFvTt613AYDOgO2jzw+00cVSMny8XB3yMY=github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.32/go.mod h1:2tNZkuWz54arj8mHVf+8Y7cKkcD8Wr/fBpENgEXpjLc=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.38 h1:A3UAuCmx7LyUcrixBTzKJYYIUZ2yTvn6ZhT8PB+7APk=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.38/go.mod h1:1PDUYG9Z+JrbbsobsAZHjWOm9QBT/djiK3QbykTL5Z4=github.com/aws/aws-sdk-go-v2/service/ebs v1.22.1 h1:SeDJWG4pmye+/aO6k+zt9clPTUy1MXqUmkW8rbAddQg=github.com/aws/aws-sdk-go-v2/service/ebs v1.22.1/go.mod h1:wRzaW0v9GGQS0h//wpsVDw3Hah5gs5UP+NxoyGeZIGM=github.com/aws/aws-sdk-go-v2/service/ec2 v1.273.0 h1:lJZflraZ8ddloz8bA2dX9ukc4mkLQFoYwZlzG7GLgWk=github.com/aws/aws-sdk-go-v2/service/ec2 v1.273.0/go.mod h1:QrV+/GjhSrJh6MRRuTO6ZEg4M2I0nwPakf0lZHSrE1o=github.com/aws/aws-sdk-go-v2/service/ec2 v1.304.0 h1:wZthLlYdKxBo7NpWLbl0A/8DB/QNDB+8RJa9WboK9Q0=github.com/aws/aws-sdk-go-v2/service/ec2 v1.304.0/go.mod h1:Y95W0Hm6FYLPa6o0hbnJ+sWgmdc4ifcLFjGkdobWVhY=+github.com/aws/aws-sdk-go-v2/service/ecr v1.60.6 h1:RbjO6G1wu+q43r0322sDABXi9vq/YZp254BBKAeLtRI=+github.com/aws/aws-sdk-go-v2/service/ecr v1.60.6/go.mod h1:snsosIuclt9tpFKzldCnu1ykT5SYEND/bK9qTJmoJ+o=github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=@@ -695,6 +717,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sgithub.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo=github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 h1:NEe7FaViguRQEm8zl8Ay/kC/QRsMtWUiCGZajQIsLdc=github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3/go.mod h1:JLuCKu5VfiLBBBl/5IzZILU7rxS0koQpHzMOCzycOJU=+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.24 h1:mdPwDQPqxlw9Sc62Nt15yjEcARaDbPXkjRYtXsUripo=github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.24/go.mod h1:ls5ytnwLTcQaUu32fMYXFI3MjpKuTwL840PAm9iqyEg=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s=@@ -704,20 +727,26 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozgithub.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29/go.mod h1:LfRkPCD8YHDM2E5eTkos2UpwYeZnBcVarTa8L59bJHA=github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.31/go.mod h1:wAhpCQbkov+IcvjozJbd2xRCoZybUEHNkcFunssNACg=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.37 h1:a3D4AjrOrTrP8+d9ILBthqrElf0z1JNol09Xvnwcys8=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.37/go.mod h1:ky0gTu+ukvUTuUKFIpp6Wid4oninrkCyvbFkVs0kpHM=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 h1:R3uW0iKl8rgNEXNjVGliW/oMEh9fO/LlUEV8RvIFr1I=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12/go.mod h1:XEttbEr5yqsw8ebi7vlDoGJJjMXRez4/s9pibpJyL5s=+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.32 h1:jWXtZdCnhXa9sGFixRaU2AxT4DIVse9HS4E2f+/KwV0=github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.32/go.mod h1:9JS1UpfVvyD/ZPX8GsKb/Pq8scEM+7GP5fqh9SwH7po=github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw=github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4=github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1 h1:Dq82AV+Qxpno/fG162eAhnD8d48t9S+GZCfz7yv1VeA=github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1/go.mod h1:MbKLznDKpf7PnSonNRUVYZzfP0CeLkRIUexeblgKcU4=+github.com/aws/aws-sdk-go-v2/service/s3 v1.106.0 h1:7QZWVJZWzHivHWIa+5TELLaBBkbuoj0GPwQtMlJ0sqk=github.com/aws/aws-sdk-go-v2/service/s3 v1.106.0/go.mod h1:fcvq5L7dK+5cQFicEJwpI6e6Wn8NY2i6yT5wRLYVc7s=github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y=github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M=github.com/aws/aws-sdk-go-v2/service/signin v1.1.5/go.mod h1:LxYujSTLPRlp2vTtcUO/+1ilrew8ytt6SvQyOgejzFQ=github.com/aws/aws-sdk-go-v2/service/signin v1.5.0/go.mod h1:mCF3AK9PpL49oOrhniUXWAfhVBVQ/XbytoE5eccZUIs=+github.com/aws/aws-sdk-go-v2/service/signin v1.5.6 h1:i68sFvXidKlkiSvI7d7Ilc1/UvW4CtBOaivH7jhG4fs=+github.com/aws/aws-sdk-go-v2/service/signin v1.5.6/go.mod h1:/h7Obr9WTtzbjTHGASRQwLN7Bupw+TC3x8x7fyx39hE=github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0=github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8=github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 h1:NjShtS1t8r5LUfFVtFeI8xLAHQNTa7UI0VawXlrBMFQ=@@ -726,6 +755,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgithub.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw=github.com/aws/aws-sdk-go-v2/service/sso v1.31.3/go.mod h1:Lk7PlmoTYryQmyBG0EXqj5BcUbj3whXdU2s3yGI3EAc=github.com/aws/aws-sdk-go-v2/service/sso v1.33.0/go.mod h1:+e6BMRMPjBQoCw/WovYR9GLy2IU0z4Q77smOB1DraSg=+github.com/aws/aws-sdk-go-v2/service/sso v1.33.6 h1:tpfGChmjUmv3W9WlRvy+stwKDTbFFdq8Zk9DbFPrfMU=+github.com/aws/aws-sdk-go-v2/service/sso v1.33.6/go.mod h1:CSjiDzmG/lsKkTOYjbkM+duLmRlW+LOxD64Na44ijnI=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 h1:gTsnx0xXNQ6SBbymoDvcoRHL+q4l/dAFsQuKfDWSaGc=@@ -734,6 +765,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzgithub.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6/go.mod h1:Q5N6icH+KJZDLh+ESNwzdv6cZ6vLFF/egy3IOxWhmz4=github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.0/go.mod h1:SfLK1sgviHmbI+MozR9iDwDjL4cdCVZtahsjoR+z7wg=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.6 h1:49BBtY68A+KJCQ3a2F3eUe6ROsKucxUdfHKoqorc0wI=+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.6/go.mod h1:ptG2hbs7QltE1GcQY0MpS4bfrc51KCnBXUr7OT1EEfE=github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc=github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo=github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 h1:HK5ON3KmQV2HcAunnx4sKLB9aPf3gKGwVAf7xnx0QT0=@@ -742,6 +775,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ=github.com/aws/aws-sdk-go-v2/service/sts v1.43.3/go.mod h1:r8wkDOuLaaMFqFiYAb8dGY2A3gJCOujMc6CFOVC4Zhc=github.com/aws/aws-sdk-go-v2/service/sts v1.45.0/go.mod h1:rmQ0TnHzuLPmabgjPcsywhsSOmaBDgzR4zvDxSPsGdg=+github.com/aws/aws-sdk-go-v2/service/sts v1.45.6 h1:JvExZWabChDM0qJAirQYGfOYo0ndT3edXj+fqSPNjkE=+github.com/aws/aws-sdk-go-v2/service/sts v1.45.6/go.mod h1:XZcaQkV2cItp6yEkrwljyaPOf22RuX7T43jxap/FOmM=github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=@@ -751,6 +786,8 @@ github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pgithub.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=github.com/aws/smithy-go v1.27.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=github.com/aws/smithy-go v1.27.4/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=+github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=+github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=github.com/aymanbagabas/go-udiff v0.4.0/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=@@ -853,7 +890,10 @@ github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSgithub.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=github.com/chainguard-dev/clog v1.8.0 h1:frlTMEdg3XQR+ioQ6O9i92uigY8GTUcWKpuCFkhcCHA=github.com/chainguard-dev/clog v1.8.0/go.mod h1:5MQOZi+Iu7fV7GcJG8ag8rCB5elEOpqRMKEASgnGVdo=+github.com/charmbracelet/ultraviolet v0.0.0-20260703014108-f5a850f9c2b7/go.mod h1:f/jRa757WUmaOZrbPspXymbg/GnbF+rwe4OLsG7aXYo=github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=+github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=+github.com/charmbracelet/x/exp/golden v0.0.0-20241212170349-ad4b7ae0f25f/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=github.com/checkpoint-restore/checkpointctl v1.4.0 h1:3kRns56TArwiyHOMakaumUgSZZlB1hZBkjVgR6IeZ3E=github.com/checkpoint-restore/checkpointctl v1.4.0/go.mod h1:ynQ52zQBazgcTZuxpwTFzRinIcAf0haDTC1X1LA/FKA=github.com/checkpoint-restore/checkpointctl v1.5.0 h1:Uu+D2cOf/GUyCMk23Y8L69P6YoATTe6pH+Au64O3y28=@@ -1043,6 +1083,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 h1:5RVFMOWjMyRy8cARdy79nAmgYw3hgithub.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73 h1:OGNva6WhsKst5OZf7eZOklDztV3hwtTHovdrLHV+MsA=github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=+github.com/depot/depot-go v0.5.2 h1:mQHyy1tGdmMKnlmsThjAc9mU3NHGUUUyzmnkhyotV+E=+github.com/depot/depot-go v0.5.2/go.mod h1:QQtSqwRn0flx4KxrUVSJGlh0hTFeZ19MLYvOcJbxtP0=github.com/dgraph-io/badger/v3 v3.2103.5 h1:ylPa6qzbjYRQMU6jokoj4wzcaweHylt//CH0AKt0akg=github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw=github.com/dgraph-io/badger/v4 v4.8.0/go.mod h1:U6on6e8k/RTbUWxqKR0MvugJuVmkxSNc79ap4917h4w=@@ -1052,11 +1094,14 @@ github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa5github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=+github.com/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49/go.mod h1:SKVExuS+vpu2l9IoOc0RwqE7NYnb0JlcFHFnEJkVDzc=github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=github.com/docker/buildx v0.36.0 h1:5UYbvkIXhkjiRZG15ZoWuA1BIuFatexA9yeL+b72MpM=github.com/docker/buildx v0.36.0/go.mod h1:APOldMT9ejTIiYJ44OxhFX1zt+MM1cR9zz4DQLq8qLw=+github.com/docker/buildx v0.36.1 h1:U7JTUSSeooFXbG+0HcI+CMjEIkvuZgJegXRZ1q7K63Q=+github.com/docker/buildx v0.36.1/go.mod h1:pkpx66TqJD4HOS65fORu9MYBEDbeiRxnGdN3VpH8SPM=github.com/docker/cli v29.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli v29.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/cli v29.1.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=@@ -1797,6 +1842,7 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+mgithub.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=+github.com/mattn/go-runewidth v0.0.27/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8=github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=@@ -1826,6 +1872,7 @@ github.com/microsoft/go-mssqldb v1.10.0 h1:pHEt+Qz6YFPWqREq10mqSE524QQo+/QremwTCgithub.com/microsoft/go-mssqldb v1.10.0/go.mod h1:mnG7lGa9iYJbzJqGCXyuQCegStKMr3kogDLD6+bmggg=github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=@@ -2002,6 +2049,7 @@ github.com/owenrumney/go-sarif/v2 v2.3.3 h1:ubWDJcF5i3L/EIOER+ZyQ03IfplbSU1BLOE2github.com/owenrumney/go-sarif/v2 v2.3.3/go.mod h1:MSqMMx9WqlBSY7pXoOZWgEsVB4FDNfhcaXDA1j6Sr+w=github.com/owenrumney/squealer v1.2.12 h1:6VQxQ323q7q0eKNP5p7MX4nbTW1z8wK44YvyHLwDcx0=github.com/owenrumney/squealer v1.2.12/go.mod h1:yBdddxW+31mPHXgjOAYiqCtK1/f1S3o5Jq6S6vZGtxc=+github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=github.com/pandatix/go-cvss v0.6.2 h1:TFiHlzUkT67s6UkelHmK6s1INKVUG7nlKYiWWDTITGI=github.com/pandatix/go-cvss v0.6.2/go.mod h1:jDXYlQBZrc8nvrMUVVvTG8PhmuShOnKrxP53nOFkt8Q=@@ -2134,6 +2182,9 @@ github.com/safchain/ethtool v0.6.2 h1:O3ZPFAKEUEfbtE6J/feEe2Ft7dIJ2Sy8t4SdMRiIMHgithub.com/safchain/ethtool v0.6.2/go.mod h1:VS7cn+bP3Px3rIq55xImBiZGHVLNyBh5dqG6dDQy8+I=github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=+github.com/samber/hot v0.13.0/go.mod h1:NB9v5U4NfDx7jmlrP+zHuqCuLUsywgAtCH7XOAkOxAg=+github.com/samber/slog-echo/v2 v2.0.0 h1:VLUOug7P/qiEO/uyHIxqGZWnlYczZSUBzInewnvzCck=+github.com/samber/slog-echo/v2 v2.0.0/go.mod h1:62kVIOBLr3qx9dIcUMlS+zu7e5YN3aKX4LzTdQUnDFs=github.com/samber/slog-gin v1.21.1/go.mod h1:7R4VMQGENllRLLnwGyoB5nUSB+qzxThpGe5G02xla6o=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=@@ -2181,6 +2232,7 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWicgithub.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=+github.com/sirupsen/logrus v1.10.0/go.mod h1:FXZFonkDAnFozmO+5hGAFvB0Yg9/j2SIhA/QuIkP180=github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU=github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA=github.com/snowflakedb/gosnowflake v1.6.19 h1:KSHXrQ5o7uso25hNIzi/RObXtnSGkFgie91X82KcvMY=@@ -2258,6 +2310,8 @@ github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoigithub.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d h1:3H+wrTJTy3PVEeCyrjiCWjrh7pVEodGgJgA8Q1tpcbg=github.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d/go.mod h1:/jU0OcDkhtRrbaJPiG/p3X7XOP1pkFWLvUbsnQKP6hY=github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=+github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62 h1:uppBiK+tE8tYG6fc0N8VnsC7FMZcWxnXIyaQ9GcUIU8=+github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9 h1:GWuTlpuUQBaK6u0R3HwE+eWaQ2aXwHgo8CaXgqtDQZU=github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2 h1:5p6hffZeB25G4rhBc3HU6x1aIlyDELfib+/Omq+ZfQA=@@ -2471,12 +2525,26 @@ go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=go.getarcane.app/acfs v0.2.0 h1:m7yXsLIB4MfsAE/AFP54RgtMXUr+AFEVCNiF5784XYI=go.getarcane.app/acfs v0.2.0/go.mod h1:sU3t21KctTsQM3OW10+RNB0Z6lR+YfaSr5Nxubq3cpI=+go.getarcane.app/acfs v0.4.1/go.mod h1:sU3t21KctTsQM3OW10+RNB0Z6lR+YfaSr5Nxubq3cpI=+go.getarcane.app/builds v0.3.1 h1:jymgkbcJ98o+XM9P0Ympn7m3WowWhG3vbiVwxIhhwns=+go.getarcane.app/builds v0.3.1/go.mod h1:MJXC3VNSspckX6NBu+l7kBaCckuNsXIw4B8WAuxXo94=+go.getarcane.app/docker/convert v0.1.0 h1:prlIOs6dMx6CdnetsJFZ6ak0vcistM3DcH5lrZiFHBU=+go.getarcane.app/docker/convert v0.1.0/go.mod h1:o9y4z/vah8HiHFtI+jJVFHbs8nLrkARYt88OaUlvGig=+go.getarcane.app/sys/atomic v0.1.0 h1:0HhUeGXYdKAmMW24O+OaqcjDZx6twAuYPBu9T91zKsk=+go.getarcane.app/sys/atomic v0.1.0/go.mod h1:QPb5eUXYKYG5acp9jJBAZ/PTbHbByDAQG6eDNAsZZ2w=+go.getarcane.app/sys/bytes v0.1.0/go.mod h1:R2mujqg+MmC2tr+97IPqaxzvBC8+ykng+5r+XNxwY+8=+go.getarcane.app/sys/cgroup v0.1.1 h1:c39W8FDqMXlKOZrpH+itaY+t8oC0tva0+6ztTrKvVIg=+go.getarcane.app/sys/cgroup v0.1.1/go.mod h1:2dUDhWV8qe9LRnLIqa5VQDhdWbTQ04EepttdIAe9dcM=+go.getarcane.app/sys/crypto v0.1.0 h1:HDQ2CKHkm+wZe5xb/qR7MzW5fKi0Wq8Jcyr7qDVgRWg=+go.getarcane.app/sys/crypto v0.1.0/go.mod h1:YtoRB0TENwfdNl0ZUTWkeas/8rT7NhCbI8ENsZzCCdU=go.getarcane.app/updater v0.3.6 h1:+BqoycaRsHj+cLVSzcYQuqbHxUKbtmaozMNblz5bVSw=go.getarcane.app/updater v0.3.6/go.mod h1:2ENitZR/lA5MuBn60OZYR5wvU3ZCE+pAgfrebfOlRDA=go.getarcane.app/updater v0.3.7 h1:WqHsxudvt8gvCR7iSHdxdzwH0+hM0FAh64bSypBX9Mo=go.getarcane.app/updater v0.3.7/go.mod h1:9RZOKaBbpUJfVA4Q9/jvqtjvWBwCnVw0OkPeQCnqAAo=go.getarcane.app/updater v0.7.0 h1:Rd6qJGtdJrMJ8SxfGpuP1+ZpJ604BNnhYb9UsB6O0Mg=go.getarcane.app/updater v0.7.0/go.mod h1:6b8zVFJEUMhLzDOi4jwKBA/GmbVgguv0FeGOoO67JW8=+go.getarcane.app/updater v0.7.2 h1:kJUBUgc7DLgyMD0ZKbGa2FafsTiI+hjJpIFzlI93VUc=+go.getarcane.app/updater v0.7.2/go.mod h1:0zMnkBlRjcKTugKJE03c4ZAx/1HtwgHayFVroHrQcrg=go.lsp.dev/jsonrpc2 v0.10.0 h1:Pr/YcXJoEOTMc/b6OTmcR1DPJ3mSWl/SWiU1Cct6VmI=go.lsp.dev/jsonrpc2 v0.10.0/go.mod h1:fmEzIdXPi/rf6d4uFcayi8HpFP1nBF99ERP1htC72Ac=go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 h1:hCzQgh6UcwbKgNSRurYWSqh8MufqRRPODRBblutn4TE=@@ -2631,6 +2699,7 @@ golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbgolang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=diff --git a/types/project/project.go b/types/project/project.goindex d99e7fcd0..5172787f5 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -444,6 +444,14 @@ type Details struct {// Required: falseComposeFileName string `json:"composeFileName,omitempty"`+ // ComposeFiles is the ordered project-relative list of compose files selected+ // by a COMPOSE_FILE entry in the project's .env. It is populated only when+ // COMPOSE_FILE selects more than one file; otherwise it is empty and+ // ComposeFileName is authoritative.+ //+ // Required: false+ ComposeFiles []string `json:"composeFiles,omitempty"`+// EnvContent is the environment file content.//// Required: false