From 8b58259c97b89b20d833d8be1066ad7d3b5ca0db Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 17 Apr 2025 16:15:44 +0800
Subject: [PATCH] update Dockerfile

---
 .../modules/gen/module_cloud/web/bin/docker/Dockerfile.xml   | 5 +++--
 web-api/bin/docker/Dockerfile                                | 5 +++--
 web-fast/bin/docker/Dockerfile                               | 2 +-
 web-mini/bin/docker/Dockerfile                               | 5 +++--
 web/bin/docker/Dockerfile                                    | 5 +++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
index 749ff09a..51990d7c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
@@ -5,7 +5,7 @@
 	<name>Dockerfile</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
 	<fileName>Dockerfile</fileName>
-	<content><![CDATA[FROM openjdk:8-slim
+	<content><![CDATA[FROM docker.m.daocloud.io/openjdk:8
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
@@ -20,7 +20,8 @@ ADD ./maven/web.war ./app.war
 #ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
+ENTRYPOINT if [ -f "app.war" ]; then jar -xvf app.war && rm app.war; \
+           fi && cd WEB-INF && sh startup.sh && cd WEB-INF && sh startup.sh
 
 EXPOSE 8983
 
diff --git a/web-api/bin/docker/Dockerfile b/web-api/bin/docker/Dockerfile
index 2a55c44e..2428d963 100644
--- a/web-api/bin/docker/Dockerfile
+++ b/web-api/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM docker.m.daocloud.io/openjdk:8
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
@@ -14,7 +14,8 @@ ADD ./maven/web.war ./app.war
 #ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
+ENTRYPOINT if [ -f "app.war" ]; then jar -xvf app.war && rm app.war; \
+           fi && cd WEB-INF && sh startup.sh && cd WEB-INF && sh startup.sh
 
 EXPOSE 8980
 
diff --git a/web-fast/bin/docker/Dockerfile b/web-fast/bin/docker/Dockerfile
index f7664a2c..db1ec5b5 100644
--- a/web-fast/bin/docker/Dockerfile
+++ b/web-fast/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM docker.m.daocloud.io/openjdk:8
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
diff --git a/web-mini/bin/docker/Dockerfile b/web-mini/bin/docker/Dockerfile
index 2a55c44e..2428d963 100644
--- a/web-mini/bin/docker/Dockerfile
+++ b/web-mini/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM docker.m.daocloud.io/openjdk:8
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
@@ -14,7 +14,8 @@ ADD ./maven/web.war ./app.war
 #ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
+ENTRYPOINT if [ -f "app.war" ]; then jar -xvf app.war && rm app.war; \
+           fi && cd WEB-INF && sh startup.sh && cd WEB-INF && sh startup.sh
 
 EXPOSE 8980
 
diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile
index 2a55c44e..2428d963 100644
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM docker.m.daocloud.io/openjdk:8
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
@@ -14,7 +14,8 @@ ADD ./maven/web.war ./app.war
 #ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
+ENTRYPOINT if [ -f "app.war" ]; then jar -xvf app.war && rm app.war; \
+           fi && cd WEB-INF && sh startup.sh && cd WEB-INF && sh startup.sh
 
 EXPOSE 8980