From 4da27a2afcb1378ef3c405e15c86adc3d87e5e49 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 01:24:59 +0000 Subject: [PATCH 01/18] add ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 ruoyi-auth/Dockerfile diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile new file mode 100644 index 00000000..d6c568e8 --- /dev/null +++ b/ruoyi-auth/Dockerfile @@ -0,0 +1,13 @@ +FROM openjdk:8-jdk +LABEL maintainer=leifengyang + + +#启动自行加载 服务名-prod.yml配置 +ENV PARAMS="--server.port=8080 --spring.profiles.active=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone + +COPY target/*.jar /app.jar +EXPOSE 8080 + +# +ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar ${PARAMS}"] \ No newline at end of file From dae7182b48418c8bc7e87d3d96609520c3dffcc9 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 01:48:04 +0000 Subject: [PATCH 02/18] add ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 ruoyi-gateway/Dockerfile diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile new file mode 100644 index 00000000..d6c568e8 --- /dev/null +++ b/ruoyi-gateway/Dockerfile @@ -0,0 +1,13 @@ +FROM openjdk:8-jdk +LABEL maintainer=leifengyang + + +#启动自行加载 服务名-prod.yml配置 +ENV PARAMS="--server.port=8080 --spring.profiles.active=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone + +COPY target/*.jar /app.jar +EXPOSE 8080 + +# +ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar ${PARAMS}"] \ No newline at end of file From 757f122f7918a43626b5fcacfa6f38e09f3f36fa Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 01:55:49 +0000 Subject: [PATCH 03/18] update ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index d6c568e8..e4a1aadd 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer=leifengyang ENV PARAMS="--server.port=8080 --spring.profiles.active=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -COPY target/*.jar /app.jar +COPY ruoyi-gateway/target/*.jar /app.jar EXPOSE 8080 # From 831c6963aa9045f4f2564e765452ce00759c9d17 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 03:12:55 +0000 Subject: [PATCH 04/18] v1.0 Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index e4a1aadd..3fb5f045 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jdk -LABEL maintainer=leifengyang +FROM hub.iot.chinamobile.com/oneos/oneos_jdk:1.8.0_271 +LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 From 81962c5af4d0a5b976eebf5540ddf40bb37d5b41 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 03:21:08 +0000 Subject: [PATCH 05/18] v1.0 Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index 3fb5f045..1d12678a 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -4,7 +4,9 @@ LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 ENV PARAMS="--server.port=8080 --spring.profiles.active=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone + +# 基础镜像已经修改完时区，这里注释掉 +# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone COPY ruoyi-gateway/target/*.jar /app.jar EXPOSE 8080 From 7f1ce56a96feebbc62654dbe28ec2db1208c023c Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 07:28:00 +0000 Subject: [PATCH 06/18] update ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index 1d12678a..c27a7f6a 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 -ENV PARAMS="--server.port=8080 --spring.profiles.active=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" +ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.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 From fc7ed5d5ce75356442755c9f80fa8046f63379e5 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 07:33:28 +0000 Subject: [PATCH 07/18] update ruoyi-gateway/src/main/resources/bootstrap.yml. Signed-off-by: tgooogt --- ruoyi-gateway/src/main/resources/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..4d44f14c 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json From 86bd4d956fd98cfabd98351cae637a404dc02444 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 07:37:28 +0000 Subject: [PATCH 08/18] update ruoyi-gateway/src/main/resources/bootstrap.yml. Signed-off-by: tgooogt --- ruoyi-gateway/src/main/resources/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 4d44f14c..4c1dabaa 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 + server-addr: his-nacos.oneos-tg:8848 config: # 配置中心地址 - server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 + server-addr: his-nacos.oneos-tg:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: i64b4f3096e1369d6259eb213-redis.oneos-tg:8848 + server-addr: his-nacos.oneos-tg:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json From 75b7e2f5ab043b863540d482173b305a38ec6b67 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 07:57:32 +0000 Subject: [PATCH 09/18] update ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index c27a7f6a..107445dd 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 -ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.file-extension=yml" +ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.server-addr=his-nacos.oneos-tg --spring.cloud.nacos.config.file-extension=yml" # 基础镜像已经修改完时区，这里注释掉 # RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone From c52ea32ef109e8c22eea4bd9dc676c23f2927c68 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 08:04:33 +0000 Subject: [PATCH 10/18] update ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index 107445dd..d78a0746 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 -ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.server-addr=his-nacos.oneos-tg --spring.cloud.nacos.config.file-extension=yml" +ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.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 From b7efdeccf55589d98343e33a2b2207248814d717 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 08:16:41 +0000 Subject: [PATCH 11/18] update ruoyi-gateway/Dockerfile. Signed-off-by: tgooogt --- ruoyi-gateway/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index d78a0746..90435bca 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer=tangang #启动自行加载 服务名-prod.yml配置 -ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.server-addr=his-nacos.oneos-tg:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=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 From f000692e764ba61f9583347f76582d2b6ececafe Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 08:25:31 +0000 Subject: [PATCH 12/18] update ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index d6c568e8..90435bca 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -1,12 +1,14 @@ -FROM openjdk:8-jdk -LABEL maintainer=leifengyang +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=dev --spring.cloud.nacos.server-addr=his-nacos.his:8848 --spring.cloud.nacos.config.file-extension=yml" -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone +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" -COPY target/*.jar /app.jar +# 基础镜像已经修改完时区，这里注释掉 +# RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone + +COPY ruoyi-gateway/target/*.jar /app.jar EXPOSE 8080 # From b9d3ea0f205910edfa3b79fa932199b5930feae7 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 08:25:58 +0000 Subject: [PATCH 13/18] update ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index 90435bca..da7907a3 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -8,7 +8,7 @@ ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.naco # 基础镜像已经修改完时区，这里注释掉 # RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -COPY ruoyi-gateway/target/*.jar /app.jar +COPY ruoyi-auth/target/*.jar /app.jar EXPOSE 8080 # From 0349242b5e34ed868f92b504ed183fae53d167bd Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 08:31:11 +0000 Subject: [PATCH 14/18] update ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index da7907a3..c897990a 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -3,7 +3,7 @@ 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" +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 From f26510d26c896da58e7f83f4bdaf2947b8f4584a Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 09:00:03 +0000 Subject: [PATCH 15/18] update ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index c897990a..30f9c6f3 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -3,7 +3,7 @@ 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" +#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 @@ -12,4 +12,4 @@ 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}"] \ No newline at end of file +ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar "] \ No newline at end of file From 8055cc5d6599ded013ec58b596814e143d8e9e73 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 09:01:40 +0000 Subject: [PATCH 16/18] update ruoyi-auth/src/main/resources/bootstrap.yml. Signed-off-by: tgooogt --- ruoyi-auth/src/main/resources/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..136d469f 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -9,15 +9,15 @@ 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 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: his-nacos.oneos-tg:8848 # 配置文件格式 file-extension: yml # 共享配置 From 683c73e26d99794eca2219d03ad3685f80c65db1 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 09:09:03 +0000 Subject: [PATCH 17/18] update ruoyi-auth/src/main/resources/bootstrap.yml. Signed-off-by: tgooogt --- ruoyi-auth/src/main/resources/bootstrap.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 136d469f..076e180c 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,13 @@ spring: discovery: # 服务注册地址 server-addr: his-nacos.oneos-tg:8848 + username: nacos + password: nacos config: # 配置中心地址 server-addr: his-nacos.oneos-tg:8848 + username: nacos + password: nacos # 配置文件格式 file-extension: yml # 共享配置 From 53d0fb3e97386ebc24692cb78ef0185748fba9d9 Mon Sep 17 00:00:00 2001 From: tgooogt Date: Wed, 19 Jul 2023 09:25:41 +0000 Subject: [PATCH 18/18] update ruoyi-auth/Dockerfile. Signed-off-by: tgooogt --- ruoyi-auth/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index 30f9c6f3..20097f20 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -3,7 +3,7 @@ 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" +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 @@ -12,4 +12,4 @@ 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 "] \ No newline at end of file +ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/./urandom -jar /app.jar $PARAMS"] \ No newline at end of file