feat: setProjectName accepts null to fallback to Docker default Fixes #…

…362
avast · Jul 1, 2022 · c15bc18 · c15bc18
1 parent 33cb671
commit c15bc18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeExecutor.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeExecutor.groovy
@@ -88,7 +88,7 @@ abstract class ComposeExecutor implements BuildService<Parameters>, AutoCloseabl
                 }
             }
             finalArgs.addAll(parameters.useComposeFiles.get().collectMany { ['-f', it].asCollection() })
-            String pn = parameters.projectName.get()
+            String pn = parameters.projectName.getOrNull()
             if (pn) {
                 finalArgs.addAll(['-p', pn])
             }

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -70,13 +70,8 @@ abstract class ComposeSettings {
     protected Boolean customProjectNameSet
     protected String safeProjectNamePrefix
     void setProjectName(String customProjectName) {
-        if (customProjectName == null || customProjectName.isEmpty()) {
-            this.customProjectName = null
-            this.customProjectNameSet = false
-        } else {
-            this.customProjectName = customProjectName
-            this.customProjectNameSet = true
-        }
+        this.customProjectName = customProjectName
+        this.customProjectNameSet = true
     }
     private Provider<String> projectNameProvider
     Provider<String> getProjectName() {