Merge pull request '构建脚本微调' (#20) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #20
This commit is contained in:
root 2024-09-25 18:15:06 +08:00
commit 9b66eb560e
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,8 @@ type: docker # 定义流水线类型还有kubernetes、exec、ssh等类型
name: filesystem-drone # 定义流水线名称 name: filesystem-drone # 定义流水线名称
clone:
disable: true
steps: # 定义流水线执行步骤,这些步骤将顺序执行 steps: # 定义流水线执行步骤,这些步骤将顺序执行
- name: package-and-push-image - name: package-and-push-image
@ -28,7 +29,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
script: script:
- cd /root/allLikeMall - cd /root/allLikeMall
- git fetch origin - git fetch origin
- git reset --hard origin/main - git reset --hard origin/master
- git clean -fd - git clean -fd
- mvn package -Dmaven.test.skip=true - mvn package -Dmaven.test.skip=true
- cd yudao-server - cd yudao-server

View File

@ -10,7 +10,6 @@ ADD ./target/yudao-server.jar app.jar
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖 ## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖
ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom"
Duser.timezone=Asia/Shanghai"
## 应用参数 ## 应用参数
ENV ARGS="" ENV ARGS=""