fix: "invalid reference format" error by avoiding trailing underscore if nested name is not set (#461)

Jim Bassett · web-flow · commit ce6f4e88e71e · 2024-10-17T09:44:05.000+02:00
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -97,10 +97,10 @@ abstract class ComposeSettings {
                 return customProjectName
             }
             else if (projectNamePrefix) {
-                return "${projectNamePrefix}_${nestedName}"
+                return nestedName ? "${projectNamePrefix}_${nestedName}" : projectNamePrefix
             }
             else {
-                return "${safeProjectNamePrefix}_${nestedName}"
+                return nestedName ? "${safeProjectNamePrefix}_${nestedName}" : safeProjectNamePrefix
             }
         }).map{ String projectName ->
             // docker-compose project names must be lowercase

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,10 @@ abstract class ComposeSettings {`
`97`	`97`	`return customProjectName`
`98`	`98`	`}`
`99`	`99`	`else if (projectNamePrefix) {`
`100`		`- return "${projectNamePrefix}_${nestedName}"`
	`100`	`+ return nestedName ? "${projectNamePrefix}_${nestedName}" : projectNamePrefix`
`101`	`101`	`}`
`102`	`102`	`else {`
`103`		`- return "${safeProjectNamePrefix}_${nestedName}"`
	`103`	`+ return nestedName ? "${safeProjectNamePrefix}_${nestedName}" : safeProjectNamePrefix`
`104`	`104`	`}`
`105`	`105`	`}).map{ String projectName ->`
`106`	`106`	`// docker-compose project names must be lowercase`