Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: dont remove .env content from git sync
Kyle Mendell95b7ac2982c1
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 23f7f8db6..68c3ecee0 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -1093,15 +1093,8 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, nareturn nil, fmt.Errorf("failed to save project files: %w", err)}case envContent != nil:- envPath := filepath.Join(proj.Path, ".env")- if *envContent == "" {- if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {- return nil, fmt.Errorf("failed to remove env file: %w", err)- }- } else {- if err := fs.WriteEnvFile(projectsDirectory, proj.Path, *envContent); err != nil {- return nil, err- }+ if err := fs.WriteEnvFile(projectsDirectory, proj.Path, *envContent); err != nil {+ return nil, err}}diff --git a/backend/internal/utils/fs/fs_writer.go b/backend/internal/utils/fs/fs_writer.goindex 74dbbb0a2..93041de9b 100644--- a/backend/internal/utils/fs/fs_writer.go+++ b/backend/internal/utils/fs/fs_writer.go@@ -109,13 +109,20 @@ func WriteProjectFiles(projectsRoot, dirPath, composeContent string, envContentreturn err}- // Always create a .env file, even if empty, to satisfy compose files that reference env_file: .env- envValue := ""+ // If envContent is nil, we check if .env already exists.+ // We only create an empty one if it doesn't exist, to satisfy+ // compose-go from failing when the compose file references env_file: .envif envContent != nil {- envValue = *envContent- }- if err := WriteEnvFile(projectsRoot, dirPath, envValue); err != nil {- return err+ if err := WriteEnvFile(projectsRoot, dirPath, *envContent); err != nil {+ return err+ }+ } else {+ envPath := filepath.Join(dirPath, ".env")+ if _, err := os.Stat(envPath); os.IsNotExist(err) {+ if err := WriteEnvFile(projectsRoot, dirPath, ""); err != nil {+ return err+ }+ }}return nildiff --git a/backend/internal/utils/fs/fs_writer_test.go b/backend/internal/utils/fs/fs_writer_test.goindex 08d9b6a1c..375f33c10 100644--- a/backend/internal/utils/fs/fs_writer_test.go+++ b/backend/internal/utils/fs/fs_writer_test.go@@ -60,3 +60,44 @@ func TestWriteFilesPermissions(t *testing.T) {}})}++func TestWriteProjectFiles(t *testing.T) {+ tmpDir := t.TempDir()+ projectsRoot := tmpDir+ projectDir := filepath.Join(tmpDir, "test-project")++ t.Run("creates new project with empty env when envContent is nil", func(t *testing.T) {+ err := WriteProjectFiles(projectsRoot, projectDir, "services: {}", nil)+ require.NoError(t, err)++ envPath := filepath.Join(projectDir, ".env")+ content, err := os.ReadFile(envPath)+ require.NoError(t, err)+ assert.Equal(t, "", string(content))+ })++ t.Run("preserves existing env when envContent is nil", func(t *testing.T) {+ envPath := filepath.Join(projectDir, ".env")+ expected := "EXISTING=true"+ err := os.WriteFile(envPath, []byte(expected), 0644)+ require.NoError(t, err)++ err = WriteProjectFiles(projectsRoot, projectDir, "services: { updated: true }", nil)+ require.NoError(t, err)++ content, err := os.ReadFile(envPath)+ require.NoError(t, err)+ assert.Equal(t, expected, string(content))+ })++ t.Run("overwrites env when envContent is provided", func(t *testing.T) {+ envPath := filepath.Join(projectDir, ".env")+ newContent := "NEW=true"+ err := WriteProjectFiles(projectsRoot, projectDir, "services: {}", &newContent)+ require.NoError(t, err)++ content, err := os.ReadFile(envPath)+ require.NoError(t, err)+ assert.Equal(t, newContent, string(content))+ })+}