From 32bedd1bfd9322e3cf1f5f45479885414be23a95 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 08:09:03 +0800 Subject: [PATCH 1/6] feat(cd) change Dockerfile --- ruoyi-admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index 126ce2f..fd71385 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -6,6 +6,6 @@ ARG SPRING_PROFILE ENV JAVA_OPTS "${JAVA_OPTS} ${CUSTOM_OPTS}" -COPY target/*.jar /javarun +COPY *.jar /javarun CMD ["bash","-c","java ${JAVA_OPTS} -Dspring.profiles.active=${SPRING_PROFILE} -jar /javarun/*.jar"] -- 2.36.5 From e16475d629483895745d269324a222b72f17f93b Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 22:34:46 +0800 Subject: [PATCH 2/6] feat(cd) drone pipeline add event --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index c223f12..d648291 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,3 +42,5 @@ volumes: # 定义流水线挂载目录，用于共享数据 trigger: branch: - test + event: + - pull_request -- 2.36.5 From 29fe333fa6e949d5985c1dad73a466971adc49f4 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 22:37:14 +0800 Subject: [PATCH 3/6] feat(cd) drone pipeline add event --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d648291..ddf5fb2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,8 +38,7 @@ volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-cache host: path: /app/maven/cache -# drone执行触发器 -trigger: +when: branch: - test event: -- 2.36.5 From ae3a54062e2d55e22f5d96c6f8454780c857aed9 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 22:58:18 +0800 Subject: [PATCH 4/6] feat(cd) drone pipeline add event --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ddf5fb2..7cd12c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - name: maven-build path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn -T 8 clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令 + - mvn -T 4 clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令 - cp ruoyi-admin/target/*.jar /app/build/ - cp ruoyi-admin/Dockerfile /app/build/Dockerfile - cp run.sh /app/build/run.sh -- 2.36.5 From 8e63d6fc69d67e1df4ba546c9d70fadaa174e500 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 23:11:36 +0800 Subject: [PATCH 5/6] feat(cd) drone pipeline add event --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7cd12c6..170c81e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - name: maven-build path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn -T 4 clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令 + - mvn clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令 - cp ruoyi-admin/target/*.jar /app/build/ - cp ruoyi-admin/Dockerfile /app/build/Dockerfile - cp run.sh /app/build/run.sh -- 2.36.5 From b8f305e0b78c3a988a39165b4a67e4d91608aa55 Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 17 Mar 2023 23:15:04 +0800 Subject: [PATCH 6/6] feat(cd) drone pipeline add event test --- ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index c813a74..0f3af91 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -17,7 +17,7 @@ public class RuoYiApplication public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); log.info("=========================cd auto deploy success========="); + SpringApplication.run(RuoYiApplication.class, args); } } -- 2.36.5