Merge branch 'develop' into feature/credentials

zguesmi · zguesmi · commit 59dbbc217f1c · 2020-04-16T15:40:56.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -177,7 +177,7 @@ task buildImage(type: Exec) {
 }
 
 buildImage.dependsOn prepareDockerFile
-buildImage.enabled = isMasterBranch || project.hasProperty("forceDockerBuild")
+buildImage.enabled = (isMasterBranch || isDevelopBranch ) || project.hasProperty("forceDockerBuild")
 
 task pushImage(type: Exec) {
     if (project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")) {
@@ -192,7 +192,7 @@ task pushImage(type: Exec) {
 }
 
 pushImage.dependsOn buildImage
-pushImage.enabled = isMasterBranch && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")
+pushImage.enabled = (isMasterBranch || isDevelopBranch ) && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")
 
 //gradle bootRun -PproxyHost=192.168.XX.XXX -PproxyPort=3128
 project.ext.getJvmArgs = {

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ task buildImage(type: Exec) {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`buildImage.dependsOn prepareDockerFile`
`180`		`-buildImage.enabled = isMasterBranch \|\| project.hasProperty("forceDockerBuild")`
	`180`	`+buildImage.enabled = (isMasterBranch \|\| isDevelopBranch ) \|\| project.hasProperty("forceDockerBuild")`
`181`	`181`
`182`	`182`	`task pushImage(type: Exec) {`
`183`	`183`	`if (project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")) {`
`@@ -192,7 +192,7 @@ task pushImage(type: Exec) {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`pushImage.dependsOn buildImage`
`195`		`-pushImage.enabled = isMasterBranch && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")`
	`195`	`+pushImage.enabled = (isMasterBranch \|\| isDevelopBranch ) && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")`
`196`	`196`
`197`	`197`	`//gradle bootRun -PproxyHost=192.168.XX.XXX -PproxyPort=3128`
`198`	`198`	`project.ext.getJvmArgs = {`