updated jenkinsfile

transistive · transistive · commit 966bef8a6635 · 2020-12-16T11:49:26.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,16 +13,15 @@ pipeline {
         }
         stage('Build') {
             steps {
-                sh 'docker build -t php-neo4j:static-analysis .'
+                sh 'docker build -t php-neo4j:static-analysis-$BRANCH_NAME .'
                 sh 'docker-compose -p $BRANCH_NAME -f docker/docker-compose.yml build --parallel'
                 sh 'docker-compose -p $BRANCH_NAME build'
-                sh 'docker build -t php-neo4j:static-analysis .'
             }
         }
         stage('Static Analysis') {
             steps {
-                sh 'docker run php-neo4j:static-analysis tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run'
-                sh 'docker run php-neo4j:static-analysis tools/psalm/vendor/bin/psalm --show-info=true'
+                sh 'docker run php-neo4j:static-analysis-$BRANCH_NAME tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run'
+                sh 'docker run php-neo4j:static-analysis-$BRANCH_NAME tools/psalm/vendor/bin/psalm --show-info=true'
             }
         }
         stage('Test') {

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,15 @@ pipeline {`
`13`	`13`	`}`
`14`	`14`	`stage('Build') {`
`15`	`15`	`steps {`
`16`		`- sh 'docker build -t php-neo4j:static-analysis .'`
	`16`	`+ sh 'docker build -t php-neo4j:static-analysis-$BRANCH_NAME .'`
`17`	`17`	`sh 'docker-compose -p $BRANCH_NAME -f docker/docker-compose.yml build --parallel'`
`18`	`18`	`sh 'docker-compose -p $BRANCH_NAME build'`
`19`		`- sh 'docker build -t php-neo4j:static-analysis .'`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`	`stage('Static Analysis') {`
`23`	`22`	`steps {`
`24`		`- sh 'docker run php-neo4j:static-analysis tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run'`
`25`		`- sh 'docker run php-neo4j:static-analysis tools/psalm/vendor/bin/psalm --show-info=true'`
	`23`	`+ sh 'docker run php-neo4j:static-analysis-$BRANCH_NAME tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run'`
	`24`	`+ sh 'docker run php-neo4j:static-analysis-$BRANCH_NAME tools/psalm/vendor/bin/psalm --show-info=true'`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`stage('Test') {`