xiehuanqun 1 mês atrás
pai
commit
7e3e6c5d86
1 arquivos alterados com 30 adições e 25 exclusões
  1. 30 25
      .drone.yml

+ 30 - 25
.drone.yml

@@ -17,7 +17,7 @@ steps:
       mount:
         - /root/.m2/repository
     volumes:
-      - name: maven-cache
+      - name: repository
         path: /cache
 
   # 打包 prod
@@ -27,13 +27,13 @@ steps:
       - name: maven-cache
         path: /root/.m2
       - name: maven-build
-        path: /home/TestApp/build
+        path: /app/build
     commands:
       - mvn clean package -P prod
-      - mkdir -p /home/TestApp/build
-      - cp target/test.jar /home/TestApp/build/test.jar
-      - cp Dockerfile /home/TestApp/build/Dockerfile
-      - cp docker-compose.yml /home/TestApp/build/docker-compose.yml
+      - mkdir -p /app/build/target
+      - cp target/test.jar /app/build/target/test.jar
+      - cp Dockerfile /app/build/Dockerfile
+      - cp docker-compose.yml /app/build/docker-compose.yml
     when:
       branch:
         master
@@ -45,13 +45,13 @@ steps:
       - name: maven-cache
         path: /root/.m2
       - name: maven-build-dev
-        path: /home/TestAppDev/build
+        path: /app/build
     commands:
       - mvn clean package -P dev
-      - mkdir -p /home/TestAppDev/build
-      - cp target/test-dev.jar /home/TestAppDev/build/test.jar
-      - cp Dockerfile /home/TestAppDev/build/Dockerfile
-      - cp docker-compose.yml /home/TestAppDev/build/docker-compose.yml
+      - mkdir -p /app/build/target
+      - cp target/test-dev.jar /app/build/target/test-dev.jar
+      - cp Dockerfile /app/build/Dockerfile
+      - cp docker-compose.yml /app/build/docker-compose.yml
     when:
       branch:
         develop
@@ -69,12 +69,15 @@ steps:
         from_secret: ssh_pwd
       command_timeout: 5m
       source:
-        - build/test.jar
-        - build/Dockerfile
-        - build/docker-compose.yml
+        - target/test.jar
+        - Dockerfile
+        - docker-compose.yml
       target: /home/TestApp/
     when:
       branch: master
+      path:
+        - "!db/**"
+        - "!README.md"
 
   # 部署 prod
   - name: deploy-ssh-prod
@@ -87,12 +90,13 @@ steps:
         from_secret: ssh_user
       password:
         from_secret: ssh_pwd
-      command_timeout: 2m
+      command_timeout: 1m
       script:
         - cd /home/TestApp
+        - sudo docker build -t test .
         - sudo docker-compose down
-        - sudo docker-compose up -d --build
-        - echo "Docker App started."
+        - sudo docker-compose up -d
+        - sudo echo "Docker App started."
     when:
       branch: master
 
@@ -109,9 +113,9 @@ steps:
         from_secret: ssh_pwd
       command_timeout: 5m
       source:
-        - build/test.jar
-        - build/Dockerfile
-        - build/docker-compose.yml
+        - target/test-dev.jar
+        - Dockerfile
+        - docker-compose.yml
       target: /home/TestAppDev/
     when:
       branch: develop
@@ -127,12 +131,13 @@ steps:
         from_secret: ssh_user
       password:
         from_secret: ssh_pwd
-      command_timeout: 2m
+      command_timeout: 1m
       script:
         - cd /home/TestAppDev
+        - sudo docker build -t test-dev .
         - sudo docker-compose down
-        - sudo docker-compose up -d --build
-        - echo "Docker App started."
+        - sudo docker-compose up -d
+        - sudo echo "Docker App started."
     when:
       branch: develop
 
@@ -150,10 +155,10 @@ steps:
 volumes:
   - name: maven-build
     host:
-      path: /home/TestApp/build
+      path: /home/TestApp
   - name: maven-build-dev
     host:
-      path: /home/TestAppDev/build
+      path: /home/TestAppDev
   - name: maven-cache
     host:
       path: /root/docker/maven/cache