From 309bb333af67dcf15b8b7a1a99a4696b4508f2d9 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 10:08:28 +0800 Subject: [PATCH 1/2] =?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 | 137 +++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 68 deletions(-) diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index a3ea0c207..cc9140517 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 @@ -99,6 +99,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 --version - mvn package -Dmaven.test.skip=true - port=48092 # 指定端口号 - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 From 2b73c4899db8d877b665a3ec2a8b5bc997c6f687 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 28 Aug 2024 10:48:03 +0800 Subject: [PATCH 2/2] =?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 | 4 ++-- package.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 package.sh diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index cc9140517..1ee8f7b52 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -99,8 +99,8 @@ 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 --version - - mvn package -Dmaven.test.skip=true + - chmod +x package.sh + - ./package.sh - port=48092 # 指定端口号 - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 - if [[ -n "$pid" ]]; then diff --git a/package.sh b/package.sh new file mode 100644 index 000000000..502174cdf --- /dev/null +++ b/package.sh @@ -0,0 +1 @@ +mvn clean package -Dmaven.test.skip=true \ No newline at end of file