ci:重构 Drone CI/CD 流程

- 更新 .drone.yml 文件,增加多服务构建和部署步骤
- 修改 Dockerfile,简化为单层结构并直接运行 JAR 文件
- 新增 docker-compose.yml 文件,定义多服务部署配置
- 优化 CI/CD 流程,支持多服务同时构建和部署
This commit is contained in:
lujianxin 2025-06-23 14:37:06 +08:00
parent dea7db83b9
commit c2ff984c12
3 changed files with 67 additions and 39 deletions

View File

@ -3,40 +3,52 @@ type: docker
name: ${serverName} # 服务名成可与jar包名保持一致 name: ${serverName} # 服务名成可与jar包名保持一致
steps: steps:
- name: build-jar # 流水线名称
image: maven:3.8.5-openjdk-17 # 定义创建容器的Docker镜像基线项目使用jdk17 - name: build-jar
volumes: # 将容器内目录挂载到宿主机仓库需要开启Trusted设置 image: alpine
- name: maven-cache environment:
path: /root/.m2 # 将maven下载依赖的目录挂载出来防止重复下载 APP_VERSION: ${APP_VERSION}
- name: maven-build volumes:
path: /home/app/build # 将应用打包好的Jar和执行脚本挂载出来 - name: build-output
commands: # 定义在Docker容器中执行的shell命令 path: /home/app/build
- mvn clean package -DskipTests=true # 应用打包命 commands:
- cp ${executePath} /home/app/build/${serverName}.jar # 需要修改提取的jar包位置默认当前在根项目的target目录下jar包名与后续执行需保持一致 - mkdir -p /home/app/build/{gateway,system,infra}
- cp start.sh /home/app/build/ - cp ruoyi-gateway/target/*.jar /home/app/build/gateway/app.jar
- cp ruoyi-modules-system/target/*.jar /home/app/build/system/app.jar
- cp yudao-module-infra/target/*.jar /home/app/build/file/app.jar
- cp Dockerfile /home/app/build/ - cp Dockerfile /home/app/build/
# - cp .dockerignore /home/app/build/
- cp docker.sh /home/app/build/
- name: build-docker - name: build-docker
image: docker image: docker
volumes: # 将容器内目录挂载到宿主机仓库需要开启Trusted设置 environment:
- name: maven-build APP_VERSION: ${APP_VERSION}
path: /home/app/build # 将应用打包好的Jar和执行脚本挂载出来 volumes:
- name: build-output
path: /home/app/build
- name: docker - name: docker
path: /var/run/docker.sock # 挂载宿主机的docker path: /var/run/docker.sock
settings: commands:
dockerfile: /home/app/build/Dockerfile
commands: # 定义在Docker容器中执行的shell命令
- cd /home/app/build - cd /home/app/build
- chmod +x docker.sh - cd gateway && docker build -t ruoyi-gateway:${APP_VERSION} -f ../Dockerfile .
- sh docker.sh - cd ../system && docker build -t ruoyi-system:${APP_VERSION} -f ../Dockerfile .
- docker ps - cd ../infra && docker build -t ruoyi-infra:${APP_VERSION} -f ../Dockerfile .
volumes: # 定义流水线挂载目录,用于共享数据 - name: deploy-with-compose
- name: maven-build image: docker/compose:1.29.2
host: environment:
path: /home/data/maven/build # 从宿主机中挂载的目录 APP_VERSION: ${APP_VERSION}
volumes:
- name: build-output
path: /home/app/build
- name: docker
path: /var/run/docker.sock
commands:
- cd /home/app/build
- cp docker-compose.yml .
- sed -i "s/\${APP_VERSION}/${APP_VERSION}/g" docker-compose.yml
- docker-compose up -d
volumes:
- name: maven-cache - name: maven-cache
host: host:
path: /home/data/maven/cache path: /home/data/maven/cache

View File

@ -1,18 +1,8 @@
# 目前制作docker镜像依赖的jdk基线项目使用jdk17 # 目前制作docker镜像依赖的jdk基线项目使用jdk17
FROM openjdk:17.0.2-oraclelinux8 FROM openjdk:17.0.2-oraclelinux8
ENV SERVICE_PORTS=${innerPort}
RUN mkdir -p /home/app/
WORKDIR /home/app WORKDIR /home/app
COPY ./start.sh /home/app/ COPY app.jar app.jar
# COPY ./.dockerignore /home/app/
# jar包名建议与docker.sh和drone配置文件的服务名一致
COPY ./${serverName}.jar /home/app/
RUN chmod 755 -R /home/app/ ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=prod"]
ENTRYPOINT ["/home/app/start.sh"]

26
docker-compose.yml Normal file
View File

@ -0,0 +1,26 @@
version: '3.8'
services:
gateway:
image: ruoyi-gateway:${APP_VERSION}
container_name: ruoyi-gateway
ports:
- "48080:48080"
environment:
SPRING_PROFILES_ACTIVE: dev
system:
image: ruoyi-system:${APP_VERSION}
container_name: ruoyi-system
ports:
- "48081:48081"
environment:
SPRING_PROFILES_ACTIVE: dev
infra:
image: ruoyi-infra:${APP_VERSION}
container_name: ruoyi-infra
ports:
- "48082:48082"
environment:
SPRING_PROFILES_ACTIVE: dev