Skip to content

Modern Docker Management, Designed for Everyone

fix: unable to save project due to name normalization

Kyle Mendell3e31a199a67b
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 57796e9a2..b7bf7c3af 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -1826,6 +1826,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
// compose-go can panic on malformed inputs (e.g. invalid depends_on format), so we
// catch both returned errors and panics here.
var composeValidateErr error
+ validationProjectName := normalizeComposeProjectName(proj.Name)
func() {
defer func() {
if r := recover(); r != nil {
@@ -1838,7 +1839,11 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
{Filename: "compose.yaml", Content: []byte(*composeContent)},
},
}
- _, composeValidateErr = loader.LoadWithContext(ctx, cfg)
+ _, composeValidateErr = loader.LoadWithContext(ctx, cfg, func(opts *loader.Options) {
+ if validationProjectName != "" {
+ opts.SetProjectName(validationProjectName, true)
+ }
+ })
}()
if composeValidateErr != nil {
return nil, fmt.Errorf("invalid compose file: %w", composeValidateErr)
diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.go
index 30ab1206e..e7ae2d314 100644
--- a/backend/internal/services/project_service_test.go
+++ b/backend/internal/services/project_service_test.go
@@ -476,6 +476,48 @@ func TestProjectService_UpdateProject_RenameFailsWhenProjectRunning(t *testing.T
assert.Equal(t, "Foo", *fromDB.DirName)
}
+func TestProjectService_UpdateProject_ValidatesComposeUsingExistingProjectName(t *testing.T) {
+ db := setupProjectTestDB(t)
+ ctx := context.Background()
+
+ projectsDir := t.TempDir()
+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)
+
+ settingsService, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+
+ eventService := NewEventService(db, nil, nil)
+ svc := NewProjectService(db, settingsService, eventService, nil, nil, nil)
+
+ dirName := "demo"
+ projectPath := filepath.Join(projectsDir, dirName)
+ require.NoError(t, os.MkdirAll(projectPath, 0o755))
+
+ project := &models.Project{
+ BaseModel: models.BaseModel{ID: "proj-compose-name"},
+ Name: "demo",
+ DirName: &dirName,
+ Path: projectPath,
+ Status: models.ProjectStatusStopped,
+ }
+ require.NoError(t, db.Create(project).Error)
+
+ compose := `name: ${COMPOSE_PROJECT_NAME}
+services:
+ app:
+ image: nginx:alpine
+`
+ env := "COMPOSE_PROJECT_NAME=\n"
+
+ updated, err := svc.UpdateProject(ctx, project.ID, nil, ptr(compose), ptr(env), models.User{
+ BaseModel: models.BaseModel{ID: "u1"},
+ Username: "tester",
+ })
+ require.NoError(t, err)
+ require.NotNil(t, updated)
+ assert.Equal(t, "demo", updated.Name)
+}
+
func TestProjectService_MergeBuildTags(t *testing.T) {
tags := mergeBuildTags("example/app:latest", []string{"example/app:sha", "example/app:latest", " "})
assert.Equal(t, []string{"example/app:latest", "example/app:sha"}, tags)