From 7555975b6698e61dcb67572e5d665bbfae210061 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 11:52:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-datacenter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index 292d73ea9..e37bb1003 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -101,7 +101,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - cd /root/ludu-cloud - git pull origin master - rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java - - mvn package -Dmaven.test.skip=true + - /root/apache-maven-3.9.4/bin/mvn clean package -Dmaven.test.skip=true - port=48092 # 指定端口号 - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 - if [[ -n "$pid" ]]; then From b0d64190ee2cb88bd49d2ac8c9a505219b039255 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 11:57:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-datacenter.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index e37bb1003..dcc3b924f 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -93,18 +93,15 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 port: 22 # 远程连接端口 command_timeout: 10m # 远程执行命令超时时间 - # 设置使用 bash shell - shell: bash + script: - # 导出远程服务器上的 PATH 环境变量 - - export PATH=$PATH - cd /root/ludu-cloud - git pull origin master - rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java - /root/apache-maven-3.9.4/bin/mvn clean package -Dmaven.test.skip=true - port=48092 # 指定端口号 - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 - - if [[ -n "$pid" ]]; then + - if [ -n "$pid" ]; then echo "Killing process $pid" kill -9 $pid fi From a2a66711310e79743cf2ed5cb060a7821b2051ad Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 12:02:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-datacenter.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index dcc3b924f..1cd9b4fb1 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -94,18 +94,18 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 10m # 远程执行命令超时时间 - script: - - cd /root/ludu-cloud - - git pull origin master - - rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java - - /root/apache-maven-3.9.4/bin/mvn clean package -Dmaven.test.skip=true - - port=48092 # 指定端口号 - - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 - - if [ -n "$pid" ]; then + script: | + cd /root/ludu-cloud + git pull origin master + rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java + /root/apache-maven-3.9.4/bin/mvn clean package -Dmaven.test.skip=true + port=48092 # 指定端口号 + pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 + if [ -n "$pid" ]; then echo "Killing process $pid" kill -9 $pid - fi - - nohup java -Xms256m -Xmx256m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar > api.log & + fi + nohup java -Xms256m -Xmx256m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar > api.log & volumes: # 定义流水线挂载目录，用于共享数据 From 973038b0b27eff20718bcca39919d1f509025d07 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 12:05:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-datacenter.yml | 136 +++++++++++++++++++++--------------------- package.sh | 4 -- 2 files changed, 68 insertions(+), 72 deletions(-) delete mode 100644 package.sh diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index 1cd9b4fb1..2bfce8288 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -7,74 +7,74 @@ name: ludu-system-drone # 定义流水线名称 steps: # 定义流水线执行步骤，这些步骤将顺序执行 -# - name: package # 流水线名称 -# -# image: maven:3-jdk-8 # 定义创建容器的Docker镜像 -# -# volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 -# -# - name: maven-cache -# -# path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载 -# -# - name: maven-build -# -# path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 -# -# commands: # 定义在Docker容器中执行的shell命令 -# -# - mvn package -Dmaven.test.skip=true # 应用打包命令 -# - mkdir -p /app/build/ludu-module-datacenter/target -# - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target -# - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter -# - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter -# -# - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器 -# -# image: appleboy/drone-ssh # SSH工具镜像 -# -# settings: -# -# host: 101.43.112.107 # 远程连接地址 -# -# username: root # 远程连接账号 -# -# password: -# -# from_secret: ssh_password # 从Secret中读取SSH密码 -# -# port: 22 # 远程连接端口 -# -# command_timeout: 15m # 远程执行命令超时时间 -# -# script: -# -# - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build -# - echo "datacenter done" -# -# - name: build-old-service -# -# image: appleboy/drone-ssh # SSH工具镜像 -# -# settings: -# -# host: 120.46.37.243 # 远程连接地址 -# -# username: root # 远程连接账号 -# -# password: -# -# from_secret: ssh_password2 # 从Secret中读取SSH密码 -# -# port: 22 # 远程连接端口 -# -# command_timeout: 5m # 远程执行命令超时时间 -# -# script: -# -# - cd /ludu/maven/build/ludu-module-datacenter/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - name: package # 流水线名称 + + image: maven:3-jdk-8 # 定义创建容器的Docker镜像 + + volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 + + - name: maven-cache + + path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载 + + - name: maven-build + + path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 + + commands: # 定义在Docker容器中执行的shell命令 + + - mvn package -Dmaven.test.skip=true # 应用打包命令 + - mkdir -p /app/build/ludu-module-datacenter/target + - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target + - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter + - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter + + - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器 + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 101.43.112.107 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 15m # 远程执行命令超时时间 + + script: + + - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build + - echo "datacenter done" + + - name: build-old-service + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 120.46.37.243 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password2 # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 5m # 远程执行命令超时时间 + + script: + + - cd /ludu/maven/build/ludu-module-datacenter/ + - chmod +x ./run.sh # 更改为可执行脚本 + - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 - name: build-new-service diff --git a/package.sh b/package.sh deleted file mode 100644 index 7cb03ffbb..000000000 --- a/package.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# 执行 Maven 构建 -mvn clean package -Dmaven.test.skip=true \ No newline at end of file