From 9325c8588c5cb426cbcfe5f3f2ac109c7f6cb874 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Fri, 3 Feb 2023 10:13:27 +0800
Subject: [PATCH] fixed test

---
 .DS_Store  | Bin 6148 -> 6148 bytes
 .drone.yml |  40 +++++++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 0e4237eb00c65222773dd8a226de0caff7e42d92..3850ad47f6c9b774bf62fb6476a8ef4f8f1f3793 100644
GIT binary patch
delta 178
zcmZoMXfc=|#>B`mu~2NH-rdOtA}o{nnIx39Cl%ym7MB<pTw`QnW?^Mx=V0gH=7<f>
z$S)5rNh~QXcA6Z{<n7JL!5J?gUR`Z!VW6X6X<n<NP;G7wWSSV8)z)%yh$`z_2gPUS
z<mTmfGJpXiBZOw)h0-vpYx74YG1iR@LX4Z)Iruq%F4`=}{GE9+zlbFVNDWXQ)8+t?
GEzAJTKqXrM

delta 196
zcmZoMXfc=|#>B)qu~2NH-rdClOpKEaL|7*CGfEhoOe)C9EG{uHxX#GL%)-jX&cVUO
z#l_1N8=R3}9$b=GQd;bkSQHK71tgYaBu(~Y^!DfA<m8MOkf^RUG&I*yFf}o))lsN6
zH#g8xFflf(t>xqpS2eWtOvtUQs;;T6o5=tMjEoSPfgei4s9BruGm5cpX6NAN0J?EA
XBhz>0$^0Ug96<G8Et>;GwlD(#)Q&45

diff --git a/.drone.yml b/.drone.yml
index 954480a..72ced0d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,11 +18,19 @@ steps:
     # Do stuff..
     - name: build
       image: maven:3.8-openjdk-8
+      volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+          -   name: maven-cache
+              path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
+          -   name: maven-build
+              path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
       commands:
           - mkdir /root/.m2
           - cp /usr/share/maven/ref/settings-docker.xml /root/.m2/settings.xml
           - sed -i 's/\\/usr\\/share\\/maven\\/ref\\/repository/\\/drone\\/src\\/maven/g' /root/.m2/settings.xml
           - mvn package
+          - cp target/demo-1.0.0.jar /app/build/demo-1.0.0.jar
+          - cp Dockerfile /app/build/Dockerfile
+          - cp run.sh /app/build/run.sh
     - name: rebuild-cache
       image: meltwater/drone-cache
       settings:
@@ -36,17 +44,17 @@ steps:
       volumes:
           - name: cache
             path: "/var/lib/cache"
-    - name: scp files
-      image: appleboy/drone-scp
-      settings:
-          host: 121.41.171.43
-          username:
-              from_secret: linac
-          password:
-              from_secret: linac
-          port: 22
-          target: /root
-          source: /target/*
+#    - name: scp files
+#      image: appleboy/drone-scp
+#      settings:
+#          host: 121.41.171.43
+#          username:
+#              from_secret: linac
+#          password:
+#              from_secret: linac
+#          port: 22
+#          target: /root
+#          source: /target/*
     - name: ssh
       image: appleboy/drone-ssh
       settings:
@@ -58,7 +66,7 @@ steps:
           port: 22
           command_timeout: 5m
           script:
-              - cd /work # 进入宿主机构建目录
+              - cd /data/wwwroot/docker/maven/build # 进入宿主机构建目录
               - chmod +x run.sh # 更改为可执行脚本
               - ./run.sh # 运行脚本打包应用镜像并运行
 #    - name: docker
@@ -71,7 +79,13 @@ steps:
 #              from_secret: docker_password
 #          tags:
 #              - master
-volumes:
+volumes: # 定义流水线挂载目录，用于共享数据
+    - name: maven-build
+      host:
+          path: /data/wwwroot/docker/maven/build # 从宿主机中挂载的目录
+    - name: maven-cache
+      host:
+          path: /data/wwwroot/docker/maven/cache
     - name: cache
       host:
           path: "/var/lib/cache"