Merge pull request 'xinwei' (#52) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing

Reviewed-on: #52
This commit is contained in:
root 2024-08-28 12:05:54 +08:00
commit 3abac95293
2 changed files with 79 additions and 86 deletions

View File

@ -7,74 +7,74 @@ name: ludu-system-drone # 定义流水线名称
steps: # 定义流水线执行步骤,这些步骤将顺序执行 steps: # 定义流水线执行步骤,这些步骤将顺序执行
# - name: package # 流水线名称 - name: package # 流水线名称
#
# image: maven:3-jdk-8 # 定义创建容器的Docker镜像 image: maven:3-jdk-8 # 定义创建容器的Docker镜像
#
# volumes: # 将容器内目录挂载到宿主机仓库需要开启Trusted设置 volumes: # 将容器内目录挂载到宿主机仓库需要开启Trusted设置
#
# - name: maven-cache - name: maven-cache
#
# path: /root/.m2 # 将maven下载依赖的目录挂载出来防止重复下载 path: /root/.m2 # 将maven下载依赖的目录挂载出来防止重复下载
#
# - name: maven-build - name: maven-build
#
# path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
#
# commands: # 定义在Docker容器中执行的shell命令 commands: # 定义在Docker容器中执行的shell命令
#
# - mvn package -Dmaven.test.skip=true # 应用打包命令 - mvn package -Dmaven.test.skip=true # 应用打包命令
# - mkdir -p /app/build/ludu-module-datacenter/target - 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/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/Dockerfile /app/build/ludu-module-datacenter
# - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter
#
# - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器 - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
#
# image: appleboy/drone-ssh # SSH工具镜像 image: appleboy/drone-ssh # SSH工具镜像
#
# settings: settings:
#
# host: 101.43.112.107 # 远程连接地址 host: 101.43.112.107 # 远程连接地址
#
# username: root # 远程连接账号 username: root # 远程连接账号
#
# password: password:
#
# from_secret: ssh_password # 从Secret中读取SSH密码 from_secret: ssh_password # 从Secret中读取SSH密码
#
# port: 22 # 远程连接端口 port: 22 # 远程连接端口
#
# command_timeout: 15m # 远程执行命令超时时间 command_timeout: 15m # 远程执行命令超时时间
#
# script: script:
#
# - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
# - echo "datacenter done" - echo "datacenter done"
#
# - name: build-old-service - name: build-old-service
#
# image: appleboy/drone-ssh # SSH工具镜像 image: appleboy/drone-ssh # SSH工具镜像
#
# settings: settings:
#
# host: 120.46.37.243 # 远程连接地址 host: 120.46.37.243 # 远程连接地址
#
# username: root # 远程连接账号 username: root # 远程连接账号
#
# password: password:
#
# from_secret: ssh_password2 # 从Secret中读取SSH密码 from_secret: ssh_password2 # 从Secret中读取SSH密码
#
# port: 22 # 远程连接端口 port: 22 # 远程连接端口
#
# command_timeout: 5m # 远程执行命令超时时间 command_timeout: 5m # 远程执行命令超时时间
#
# script: script:
#
# - cd /ludu/maven/build/ludu-module-datacenter/ - cd /ludu/maven/build/ludu-module-datacenter/
# - chmod +x ./run.sh # 更改为可执行脚本 - chmod +x ./run.sh # 更改为可执行脚本
# - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
- name: build-new-service - name: build-new-service
@ -93,22 +93,19 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
port: 22 # 远程连接端口 port: 22 # 远程连接端口
command_timeout: 10m # 远程执行命令超时时间 command_timeout: 10m # 远程执行命令超时时间
# 设置使用 bash shell
shell: bash script: |
script: cd /root/ludu-cloud
# 导出远程服务器上的 PATH 环境变量 git pull origin master
- export PATH=$PATH rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java
- cd /root/ludu-cloud /root/apache-maven-3.9.4/bin/mvn clean package -Dmaven.test.skip=true
- git pull origin master port=48092 # 指定端口号
- rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号
- mvn package -Dmaven.test.skip=true if [ -n "$pid" ]; then
- port=48092 # 指定端口号
- pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号
- if [[ -n "$pid" ]]; then
echo "Killing process $pid" echo "Killing process $pid"
kill -9 $pid kill -9 $pid
fi fi
- nohup java -Xms256m -Xmx256m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar > api.log & nohup java -Xms256m -Xmx256m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar > api.log &
volumes: # 定义流水线挂载目录,用于共享数据 volumes: # 定义流水线挂载目录,用于共享数据

View File

@ -1,4 +0,0 @@
#!/bin/bash
# 执行 Maven 构建
mvn clean package -Dmaven.test.skip=true