diff --git a/.drone-base.yml b/.drone-base.yml index 381dedc5e..43bd9188c 100644 --- a/.drone-base.yml +++ b/.drone-base.yml @@ -98,11 +98,11 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - cd /ludu/maven/build/yudao-gateway/ - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 + - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行 - cd /ludu/maven/build/yudao-module-system/ - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行 - cd /ludu/maven/build/yudao-module-infra/ - chmod +x ./run.sh # 更改为可执行脚本 diff --git a/.drone-infra.yml b/.drone-infra.yml new file mode 100644 index 000000000..00ba0d943 --- /dev/null +++ b/.drone-infra.yml @@ -0,0 +1,91 @@ +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 # 从宿主机中挂载的目录 \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 95dbb5740..978866c63 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,10 +55,10 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - 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 +# - 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 # 构建基础模块和复制票务停车场到轮渡服务器 @@ -93,32 +93,32 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - 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" +# - 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: 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 image: appleboy/drone-ssh # SSH工具镜像 @@ -190,7 +190,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 echo "Killing process $pid" kill -9 $pid fi - nohup java -Xms512m -Xmx512m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar --spring.profiles.active=dev > api.log & + 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