Browse Source

Merge remote-tracking branch 'origin/red' into red

huianan 2 years ago
parent
commit
dbdfde0ac8
2 changed files with 3 additions and 5 deletions
  1. 2 3
      Jenkinsfile
  2. 1 2
      docker-compose.yml

+ 2 - 3
Jenkinsfile

@@ -10,10 +10,9 @@ pipeline {
         stage('Build') {
             steps {
                 echo 'Building..'
-                sh 'docker-compose stop'
-                sh 'docker-compose rm -sf'
+                sh 'docker-compose down'
                 sh '~/tools/apache-maven-3.6.3/bin/mvn  clean install -Dmaven.test.skip=true'
-                sh 'docker build -t red:0.1 .'
+                sh 'docker build -t red:${BUILD_NUMBER} .'
             }
         }
         stage('Test') {

+ 1 - 2
docker-compose.yml

@@ -1,7 +1,6 @@
 services:
   post-project-api-red:
-    image: red:0.1
-    container_name: post-red
+    image: red:${BUILD_NUMBER}
     ports:
       - 8182:8080
     networks: