Skip to content

Commit 8046264

Browse files
committed
fix: fix reference to stack file in common stack deploy scripts
1 parent 79fd627 commit 8046264

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/groovy/to/wetransform/gradle/swarm/SwarmComposerPlugin.groovy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ import to.wetransform.gradle.swarm.config.pebble.RootOrLocalMap
3737
import to.wetransform.gradle.swarm.crypt.ConfigCryptor
3838
import to.wetransform.gradle.swarm.crypt.SimpleConfigCryptor;
3939
import to.wetransform.gradle.swarm.crypt.alice.AliceCryptor;
40-
import to.wetransform.gradle.swarm.tasks.Assemble;
40+
import to.wetransform.gradle.swarm.tasks.Assemble
41+
42+
import java.util.regex.Pattern;
4143

4244
class SwarmComposerPlugin implements Plugin<Project> {
4345

@@ -637,6 +639,10 @@ class SwarmComposerPlugin implements Plugin<Project> {
637639
// add a script file for convenient Docker Compose calls
638640
File scriptFile = project.file(composeSupported ? "${sc.stackName}-${sc.setupName}.sh" : (scriptPerSetup ? "deploy-${sc.stackName}-${sc.setupName}.sh" : "deploy-${sc.stackName}.sh"))
639641
def relPath = project.projectDir.toPath().relativize( composeFile.toPath() ).toFile().toString()
642+
if (!scriptPerSetup) {
643+
// path to compose file must be generalized - can only work if setup name is generally part of the path, as it is the case for the default path
644+
relPath = relPath.replaceAll(Pattern.quote(sc.setupName), '\\$SETUP')
645+
}
640646

641647
def run
642648
def check = ''

0 commit comments

Comments
 (0)