wuheng 2 éve
szülő
commit
afacfd0d24
2 módosított fájl, 7 hozzáadás és 6 törlés
  1. 5 3
      Jenkinsfile
  2. 2 3
      docker-compose.yml

+ 5 - 3
Jenkinsfile

@@ -8,8 +8,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'docker-compose stop'
-                sh 'docker-compose rm -sf'
+                sh 'docker-compose down'
                 sh 'npm install --registry https://registry.npm.taobao.org'
                 sh 'npm run build:prod'
             }
@@ -20,9 +19,12 @@ pipeline {
             }
         }
         stage('Deploy') {
+            environment {
+                BRANCH_NAME=${env.BRANCH_NAME}.toLowerCase()
+            }
             steps {
                 echo 'Deploying....'
-                sh 'docker build -t hitsheep:0.1 .'
+                sh 'docker build -t ${BRANCH_NAME}:${BUILD_NUMBER} .'
                 sh 'docker-compose up -d'
             }
         }

+ 2 - 3
docker-compose.yml

@@ -1,7 +1,6 @@
 services:
-  post-project-ui-HitSheep:
-    image: hitsheep:0.1
-    container_name: post-ui-HitSheep
+  post-project-ui:
+    image: ${BRANCH_NAME}:${BUILD_NUMBER}
     ports:
       - 8680:80
     networks: