clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !336 from tgooogt/master

This commit is contained in:
tgooogt 2023-07-19 09:25:43 +00:00 committed by Gitee
parent b18eced03d 53d0fb3e97
commit 97cc3cb3ae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-auth/Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM hub.iot.chinamobile.com/oneos/oneos_jdk:1.8.0_271
LABEL maintainer=tangang
#启动自行加载 服务名-prod.yml配置
ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.file-extension=yml"
# 基础镜像已经修改完时区，这里注释掉
# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
COPY ruoyi-auth/target/*.jar /app.jar
EXPOSE 8080
#
ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar $PARAMS"]

10
ruoyi-auth/src/main/resources/bootstrap.yml
View File

@ -9,15 +9,19 @@ spring:
name: ruoyi-auth
profiles:
# 环境配置
active: dev
active: prod
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: his-nacos.oneos-tg:8848
username: nacos
password: nacos
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: his-nacos.oneos-tg:8848
username: nacos
password: nacos
# 配置文件格式
file-extension: yml
# 共享配置

15
ruoyi-gateway/Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM hub.iot.chinamobile.com/oneos/oneos_jdk:1.8.0_271
LABEL maintainer=tangang
#启动自行加载 服务名-prod.yml配置
ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
# 基础镜像已经修改完时区，这里注释掉
# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
COPY ruoyi-gateway/target/*.jar /app.jar
EXPOSE 8080
#
ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar ${PARAMS}"]

6
ruoyi-gateway/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: his-nacos.oneos-tg:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: his-nacos.oneos-tg:8848
# 配置文件格式
file-extension: yml
# 共享配置
@ -33,7 +33,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 127.0.0.1:8848
server-addr: his-nacos.oneos-tg:8848
dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP
data-type: json