Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: bind mounts fail to update after git syncs (#2891)
Kyle Mendell8fb3b9dd32bd
diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.goindex 35568ba84..0958a2541 100644--- a/backend/internal/services/gitops_sync_service.go+++ b/backend/internal/services/gitops_sync_service.go@@ -1738,49 +1738,69 @@ func (s *GitOpsSyncService) createDirectorySyncProjectInternal(ctx context.Contereturn project, nil}-// updateDirectorySyncProjectInternal swaps a validated staged tree into the existing-// project path with a temporary backup so failed promotion can roll back.+// updateDirectorySyncProjectInternal mirrors a validated staged tree into the+// existing project path in place so running containers keep their bind-mount+// inodes; a temporary backup copy allows rollback if promotion fails.func (s *GitOpsSyncService) updateDirectorySyncProjectInternal(ctx context.Context, sync *models.GitOpsSync, stage *stagedDirectorySync) (*models.Project, error) {project := stage.projectprojectPath := filepath.Clean(project.Path)backupPath := ""+ existed := trueif info, err := os.Stat(projectPath); err == nil {if !info.IsDir() {return nil, fmt.Errorf("project path is not a directory: %s", projectPath)}- backupPath = fmt.Sprintf("%s.gitops-backup-%d", projectPath, time.Now().UnixNano())- if err := os.Rename(projectPath, backupPath); err != nil {- return nil, fmt.Errorf("failed to move current project directory out of the way: %w", err)+ } else if errors.Is(err, os.ErrNotExist) {+ existed = false+ if err := os.MkdirAll(projectPath, 0o755); err != nil {+ return nil, fmt.Errorf("failed to recreate project directory: %w", err)}- } else if !errors.Is(err, os.ErrNotExist) {+ } else {return nil, fmt.Errorf("failed to inspect current project directory: %w", err)}- if err := os.Rename(stage.stagePath, projectPath); err != nil {- if backupPath != "" {- _ = os.Rename(backupPath, projectPath)+ if existed {+ projectsDir, err := s.projectService.getProjectsDirectoryInternal(ctx)+ if err != nil {+ return nil, fmt.Errorf("failed to get projects directory: %w", err)+ }+ backupPath, err = os.MkdirTemp(projectsDir, ".gitops-backup-*")+ if err != nil {+ return nil, fmt.Errorf("failed to create backup directory: %w", err)}+ defer func() { _ = os.RemoveAll(backupPath) }()+ if err := projects.CopyDirectoryContents(projectPath, backupPath); err != nil {+ return nil, fmt.Errorf("failed to back up current project directory: %w", err)+ }+ }++ restore := func() {+ var restoreErr error+ if existed {+ restoreErr = projects.MirrorDirectoryContents(backupPath, projectPath)+ } else {+ restoreErr = os.RemoveAll(projectPath)+ }+ if restoreErr != nil {+ slog.ErrorContext(ctx, "Failed to restore project directory after sync promotion failure; directory may be in a mixed state", "projectPath", projectPath, "backupPath", backupPath, "error", restoreErr)+ }+ }++ if err := projects.MirrorDirectoryContents(stage.stagePath, projectPath); err != nil {+ restore()return nil, fmt.Errorf("failed to promote staged project directory: %w", err)}- stage.stagePath = ""if err := s.db.WithContext(ctx).Model(&models.Project{}).Where("id = ?", project.ID).Updates(map[string]any{"service_count": stage.serviceCount,"gitops_managed_by": sync.ID,"updated_at": time.Now(),}).Error; err != nil {- if backupPath != "" {- _ = os.RemoveAll(projectPath)- _ = os.Rename(backupPath, projectPath)- }+ restore()return nil, fmt.Errorf("failed to update project metadata after directory sync: %w", err)}- if backupPath != "" {- _ = os.RemoveAll(backupPath)- }-return project, nil}diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex 7ec73779d..80e4acd61 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -452,6 +452,61 @@ func CopyDirectoryContents(srcDir, destDir string) error {})}+// MirrorDirectoryContents makes destDir match srcDir while updating files and+// directories in place, so existing inodes (and therefore container bind+// mounts into destDir) stay valid. Entries missing from srcDir or whose type+// differs are removed, then srcDir is copied over the result.+func MirrorDirectoryContents(srcDir, destDir string) error {+ if err := pruneDirectoryContentsInternal(srcDir, destDir); err != nil {+ return err+ }+ return CopyDirectoryContents(srcDir, destDir)+}++func pruneDirectoryContentsInternal(srcDir, destDir string) error {+ srcRoot, err := os.OpenRoot(srcDir)+ if err != nil {+ return err+ }+ defer func() { _ = srcRoot.Close() }()++ destRoot, err := os.OpenRoot(destDir)+ if err != nil {+ return err+ }+ defer func() { _ = destRoot.Close() }()++ return filepath.WalkDir(destDir, func(path string, d os.DirEntry, walkErr error) error {+ if walkErr != nil {+ return walkErr+ }+ if path == destDir {+ return nil+ }++ relPath, err := filepath.Rel(destDir, path)+ if err != nil {+ return err+ }++ srcInfo, err := srcRoot.Lstat(relPath)+ if err == nil && srcInfo.Mode()&os.ModeType == d.Type() {+ return nil+ }+ if err != nil && !errors.Is(err, os.ErrNotExist) {+ return err+ }++ if err := destRoot.RemoveAll(relPath); err != nil {+ return err+ }+ if d.IsDir() {+ return filepath.SkipDir+ }+ return nil+ })+}+// CreateUniqueDir creates a unique directory within the allowed projectsRoot.// It validates that the created directory is always within projectsRoot.func CreateUniqueDir(projectsRoot, basePath, name string, perm os.FileMode) (path, folderName string, err error) {diff --git a/backend/pkg/projects/fs_util_unix_test.go b/backend/pkg/projects/fs_util_unix_test.gonew file mode 100644index 000000000..4e4357783--- /dev/null+++ b/backend/pkg/projects/fs_util_unix_test.go@@ -0,0 +1,57 @@+//go:build unix++package projects++import (+ "os"+ "path/filepath"+ "syscall"+ "testing"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func inodeOfInternal(t *testing.T, path string) uint64 {+ t.Helper()+ info, err := os.Stat(path)+ require.NoError(t, err)+ stat, ok := info.Sys().(*syscall.Stat_t)+ require.True(t, ok)+ return stat.Ino+}++func TestMirrorDirectoryContents_PreservesInodesAndPrunes(t *testing.T) {+ dst := t.TempDir()+ require.NoError(t, os.MkdirAll(filepath.Join(dst, "site"), 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(dst, "site", "index.html"), []byte("old"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(dst, "removed.txt"), []byte("stale"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(dst, ".env"), []byte("KEY=1"), 0o644))++ src := t.TempDir()+ require.NoError(t, os.MkdirAll(filepath.Join(src, "site"), 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(src, "site", "index.html"), []byte("new"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(src, ".env"), []byte("KEY=1"), 0o644))+ require.NoError(t, os.WriteFile(filepath.Join(src, "added.txt"), []byte("fresh"), 0o644))++ rootIno := inodeOfInternal(t, dst)+ siteIno := inodeOfInternal(t, filepath.Join(dst, "site"))+ indexIno := inodeOfInternal(t, filepath.Join(dst, "site", "index.html"))++ require.NoError(t, MirrorDirectoryContents(src, dst))++ assert.Equal(t, rootIno, inodeOfInternal(t, dst))+ assert.Equal(t, siteIno, inodeOfInternal(t, filepath.Join(dst, "site")))+ assert.Equal(t, indexIno, inodeOfInternal(t, filepath.Join(dst, "site", "index.html")))++ content, err := os.ReadFile(filepath.Join(dst, "site", "index.html"))+ require.NoError(t, err)+ assert.Equal(t, "new", string(content))++ assert.NoFileExists(t, filepath.Join(dst, "removed.txt"))+ assert.FileExists(t, filepath.Join(dst, "added.txt"))++ envContent, err := os.ReadFile(filepath.Join(dst, ".env"))+ require.NoError(t, err)+ assert.Equal(t, "KEY=1", string(envContent))+}