Compare commits

...

2 Commits

Author SHA1 Message Date
77caf22770 Merge pull request '构建修改' (#64) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #64
2024-08-30 11:49:23 +08:00
096d95e27d 构建修改 2024-08-30 11:48:49 +08:00
5 changed files with 75 additions and 481 deletions

View File

@ -2,81 +2,14 @@ kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: ludu-system-drone # 定义流水线名称
name: ludu-base-drone # 定义流水线名称
clone:
disable: true
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/yudao-gateway/target
- cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target
- cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway
- cp ./yudao-gateway/run.sh /app/build/yudao-gateway
- mkdir -p /app/build/yudao-module-system/target
- cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target
- cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system
- cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system
- mkdir -p /app/build/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra
- cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra
- mkdir -p /app/build/ludu-job-admin/target
- cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target
- cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin
- cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin
- 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:
- echo "start copy"
- scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build
- echo "gateway done"
- scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build
- echo "system done"
- scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
- echo "infra done"
- scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
- echo "job done"
- name: object-build
- name: base-build
image: appleboy/drone-ssh # SSH工具镜像
@ -95,29 +28,24 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
command_timeout: 20m # 远程执行命令超时时间
script:
- cd /root/ludu-cloud
- git fetch origin
- git reset --hard origin/master
- git clean -fd
- /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
- cd /ludu/maven/build/yudao-gateway/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-gateway
- chmod +x run.sh
- ./run.sh || echo "gateway build failed"
- cd /ludu/maven/build/yudao-module-system/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-module-system/yudao-module-system-biz
- chmod +x run.sh
- ./run.sh || echo "system build failed"
- cd /ludu/maven/build/yudao-module-infra/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-module-infra/yudao-module-infra-biz
- chmod +x run.sh
- ./run.sh || echo "infra build failed"
- cd /ludu/maven/build/ludu-job-admin/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build
host:
path: /ludu/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /ludu/maven/cache # 从宿主机中挂载的目录
- cd /root/ludu-cloud/ludu-job-admin/ludu-job-admin-biz
- chmod +x run.sh
- ./run.sh || echo "job build failed"

View File

@ -1,91 +0,0 @@
kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
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/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra
- cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra
- 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:
- echo "start copy"
- scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
- echo "infra done"
- name: object-build
image: appleboy/drone-ssh # SSH工具镜像
settings:
host: 121.36.203.133 # 远程连接地址
username: root # 远程连接账号
password:
from_secret: ssh_password3 # 从Secret中读取SSH密码
port: 22 # 远程连接端口
command_timeout: 20m # 远程执行命令超时时间
script:
- cd /ludu/maven/build/yudao-module-infra/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build
host:
path: /ludu/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /ludu/maven/cache # 从宿主机中挂载的目录

View File

@ -2,61 +2,14 @@ kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: ludu-system-drone # 定义流水线名称
name: ludu-parking-drone # 定义流水线名称
clone:
disable: true
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-parking/target
- cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target
- cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking
- cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking
- 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:
- echo "start copy"
- scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
- echo "parking done"
- name: object-build
- name: parking-build
image: appleboy/drone-ssh # SSH工具镜像
@ -75,18 +28,12 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
command_timeout: 20m # 远程执行命令超时时间
script:
- cd /root/ludu-cloud
- git fetch origin
- git reset --hard origin/master
- git clean -fd
- /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
- cd /ludu/maven/build/ludu-module-parking/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build
host:
path: /ludu/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /ludu/maven/cache # 从宿主机中挂载的目录
- cd /root/ludu-cloud/ludu-module-parking/ludu-module-parking-biz
- chmod +x run.sh
- ./run.sh || echo "parking build failed"

View File

@ -2,60 +2,14 @@ kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: ludu-system-drone # 定义流水线名称
name: ludu-ticketing-drone # 定义流水线名称
clone:
disable: true
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-ticketing/target
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing
- 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:
- echo "start copy"
- scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build
- echo "ticketing done"
- name: object-build
- name: ticketing-build
image: appleboy/drone-ssh # SSH工具镜像
@ -74,17 +28,12 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
command_timeout: 20m # 远程执行命令超时时间
script:
- cd /root/ludu-cloud
- git fetch origin
- git reset --hard origin/master
- git clean -fd
- /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
- cd /ludu/maven/build/ludu-module-ticketing/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build
host:
path: /ludu/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /ludu/maven/cache # 从宿主机中挂载的目录
- cd /root/ludu-cloud/ludu-module-ticketing/ludu-module-ticketing-biz
- chmod +x run.sh
- ./run.sh || echo "ticketing build failed"

View File

@ -2,124 +2,14 @@ kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: ludu-system-drone # 定义流水线名称
name: ludu-total-drone # 定义流水线名称
clone:
disable: true
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/yudao-gateway/target
- cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target
- cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway
- cp ./yudao-gateway/run.sh /app/build/yudao-gateway
- mkdir -p /app/build/yudao-module-system/target
- cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target
- cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system
- cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system
- mkdir -p /app/build/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target
- cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra
- cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra
- mkdir -p /app/build/ludu-job-admin/target
- cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target
- cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin
- cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin
- mkdir -p /app/build/ludu-module-ticketing/target
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing
- cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing
- mkdir -p /app/build/ludu-module-parking/target
- cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target
- cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking
- cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking
# - 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:
- echo "start copy"
- scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build
- echo "gateway done"
- scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build
- echo "system done"
- scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build
- echo "ticketing done"
- scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
- echo "parking done"
- scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
- echo "infra done"
- scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
- echo "job done"
# - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
# - echo "datacenter done"
# - name: build-other-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: object-build
- name: total-build
image: appleboy/drone-ssh # SSH工具镜像
@ -138,65 +28,36 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
command_timeout: 20m # 远程执行命令超时时间
script:
- cd /ludu/maven/build/yudao-gateway/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud
- git fetch origin
- git reset --hard origin/master
- git clean -fd
- /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
- cd /ludu/maven/build/yudao-module-system/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-gateway
- chmod +x run.sh
- ./run.sh || echo "gateway build failed"
- cd /ludu/maven/build/ludu-module-ticketing/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-module-system/yudao-module-system-biz
- chmod +x run.sh
- ./run.sh || echo "system build failed"
- cd /ludu/maven/build/ludu-module-parking/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/yudao-module-infra/yudao-module-infra-biz
- chmod +x run.sh
- ./run.sh || echo "infra build failed"
- cd /ludu/maven/build/yudao-module-infra/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
- cd /root/ludu-cloud/ludu-job-admin/ludu-job-admin-biz
- chmod +x run.sh
- ./run.sh || echo "job build failed"
- cd /ludu/maven/build/ludu-job-admin/
- chmod +x ./run.sh # 更改为可执行脚本
- ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
- name: build-new-service
- cd ludu-module-datacenter/ludu-module-datacenter-biz/
- chmod +x run.sh
- ./run.sh || echo "datacenter build failed"
image: appleboy/drone-ssh # SSH工具镜像
- cd /root/ludu-cloud/ludu-module-ticketing/ludu-module-ticketing-biz
- chmod +x run.sh
- ./run.sh || echo "ticketing build failed"
settings:
host: 121.36.203.133 # 远程连接地址
username: root # 远程连接账号
password:
from_secret: ssh_password3 # 从Secret中读取SSH密码
port: 22 # 远程连接端口
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
echo "Killing process $pid"
kill -9 $pid
fi
nohup java -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar --spring.profiles.active=dev > api.log &
volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build
host:
path: /ludu/maven/build # 从宿主机中挂载的目录
- name: maven-cache
host:
path: /ludu/maven/cache # 从宿主机中挂载的目录
- cd /root/ludu-cloud/ludu-module-parking/ludu-module-parking-biz
- chmod +x run.sh
- ./run.sh || echo "parking build failed"