Merge remote-tracking branch 'origin/于相涌/Lark' into 于相涌/Lark

于相涌/mail
YXY 2 years ago
commit da9eec1d5b

@ -1,25 +1,25 @@
kind: pipeline # 定义对象类型还有secret和signature两种类型 kind: pipeline # 定义对象类型还有secret和signature两种类型
type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型 type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: jar-deploy # 定义流水线名称 name: jar-deploy # 定义流水线名称
node:
name: centos-runner
steps: # 定义流水线执行步骤,这些步骤将顺序执行 steps: # 定义流水线执行步骤,这些步骤将顺序执行
- name: build-package # 流水线名称 - name: build-package # 流水线名称
image: maven:3.8-openjdk-11 # 定义创建容器的Docker镜像 image: maven:3.8-openjdk-11 # 定义创建容器的Docker镜像
pull: if-not-exists
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 -T 8 clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令 - mvn clean package -Dmaven.test.skip=true -pl ruoyi-admin -am # 应用打包命令
- cp target/*.jar /app/build/ - cp ruoyi-admin/target/*.jar /app/build/
- cp ruoyi-admin/Dockerfile /app/build/Dockerfile - cp ruoyi-admin/Dockerfile /app/build/Dockerfile
- cp run.sh /app/build/run.sh - cp run.sh /app/build/run.sh
- name: deploy-start - name: deploy-start
image: appleboy/drone-ssh # SSH工具镜像 image: appleboy/drone-ssh # SSH工具镜像
pull: if-not-exists
settings: settings:
host: 49.232.170.154 # 远程连接地址 host: 49.232.170.154 # 远程连接地址
username: root # 远程连接账号 username: root # 远程连接账号
@ -31,7 +31,6 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
- cd /app/build # 进入宿主机构建目录 - cd /app/build # 进入宿主机构建目录
- chmod +x run.sh # 更改为可执行脚本 - chmod +x run.sh # 更改为可执行脚本
- ./run.sh # 运行脚本打包应用镜像并运行 - ./run.sh # 运行脚本打包应用镜像并运行
volumes: # 定义流水线挂载目录,用于共享数据 volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-build - name: maven-build
host: host:
@ -39,7 +38,8 @@ volumes: # 定义流水线挂载目录,用于共享数据
- name: maven-cache - name: maven-cache
host: host:
path: /app/maven/cache path: /app/maven/cache
# drone执行触发器 when:
trigger:g
branch: branch:
- test - test
event:
- pull_request

@ -6,6 +6,6 @@ ARG SPRING_PROFILE
ENV JAVA_OPTS "${JAVA_OPTS} ${CUSTOM_OPTS}" ENV JAVA_OPTS "${JAVA_OPTS} ${CUSTOM_OPTS}"
COPY target/*.jar /javarun COPY *.jar /javarun
CMD ["bash","-c","java ${JAVA_OPTS} -Dspring.profiles.active=${SPRING_PROFILE} -jar /javarun/*.jar"] CMD ["bash","-c","java ${JAVA_OPTS} -Dspring.profiles.active=${SPRING_PROFILE} -jar /javarun/*.jar"]

@ -36,7 +36,7 @@
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${CONSOLE_LOG_PATTERN}</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
@ -58,7 +58,7 @@
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${CONSOLE_LOG_PATTERN}</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
@ -80,7 +80,7 @@
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${CONSOLE_LOG_PATTERN}</pattern>
</encoder> </encoder>
</appender> </appender>

Loading…
Cancel
Save