From bee295738f845f4b320f72dd7b1c06fd721f8ff8 Mon Sep 17 00:00:00 2001
From: wangchuan <WangChuan@pdc.cdmjart.com>
Date: Wed, 14 Jan 2026 19:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/fileserver/Dockerfile   |  2 ++
 base/fileserver/default.conf | 17 +++++++++++++++++
 front/Dockerfile             |  2 +-
 front/apprun.sh              | 12 ++++++------
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 base/fileserver/Dockerfile
 create mode 100644 base/fileserver/default.conf

diff --git a/base/fileserver/Dockerfile b/base/fileserver/Dockerfile
new file mode 100644
index 0000000..b2f4590
--- /dev/null
+++ b/base/fileserver/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx:1.29.4-alpine
+COPY default.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/base/fileserver/default.conf b/base/fileserver/default.conf
new file mode 100644
index 0000000..91f2ea7
--- /dev/null
+++ b/base/fileserver/default.conf
@@ -0,0 +1,17 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/local/app;
+		try_files $uri /index.html;
+        index  index.html index.htm;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
diff --git a/front/Dockerfile b/front/Dockerfile
index c51d122..18ef8ac 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -10,7 +10,7 @@ RUN set -eux; \
     yarn config set registry https://registry.npmmirror.com; \
     yarn --ignore-scripts && yarn build:$ENV;
 
-FROM harbor.zzmjart.com/library/fileserver:1.0.0
+FROM 172.31.127.251:8083/library/fileserver:1.0.0
 ARG PROJECTCODE
 ARG PROJECTVERSION
 ENV PROJECT_NAME="$PROJECTCODE" \
diff --git a/front/apprun.sh b/front/apprun.sh
index bbd0c08..d354262 100644
--- a/front/apprun.sh
+++ b/front/apprun.sh
@@ -42,7 +42,7 @@ has_docker() {
 
 # 判断是否存在当前应用的镜像
 has_image() {
-  c=$(docker images|grep $IMAGE_NAME[[:blank:]]|wc -l)
+  c=$(docker images|grep $IMAGE_NAME|wc -l)
   if [ $c = 0 ]
   then
     return 1
@@ -52,7 +52,7 @@ has_image() {
 
 # 判断是否存在网络连接
 checkOrCreate_network() {
-  c=$(docker network ls|grep "${NETWORK_NAME}[[:blank:]]"|wc -l)
+  c=$(docker network ls|grep "${NETWORK_NAME}"|wc -l)
   if [ $c = 0 ]
   then
     docker network create $NETWORK_NAME >/dev/null
@@ -131,13 +131,13 @@ load_image() {
 # 启动容器
 run() {
   stop_jar_run
-  latestImageId=$(docker images|grep $IMAGE_NAME[[:blank:]]|head -1|awk '{OFS=":"}{print $1,$2}')
+  latestImageId=$(docker images|grep $IMAGE_NAME|sort -r|head -1|awk '{OFS=":"}{print $1}')
   echo "服务 $PROJECT_NAME 最新镜像ID为 $latestImageId"
   has_stop_container
   if [ $? = 0 ]
   then
-    containerId=$(docker ps -a -f name=$PROJECT_NAME\$|awk '{print $1}')
-    nowImage=$(docker ps -a -f name=$PROJECT_NAME\$|awk '{print $2}')
+    containerId=$(docker ps -a -f name=$PROJECT_NAME\$|awk '{print $1}'|sed -n 2p)
+    nowImage=$(docker ps -a -f name=$PROJECT_NAME\$|awk '{print $2}'|sed -n 2p)
     if [ $nowImage != $latestImageId ]
     then
       docker rm -f $containerId
@@ -249,7 +249,7 @@ version() {
 # 获取当前服务所存在的镜像版本
 images() {
   has_docker
-  echo "当前使用镜像为：$(docker images|grep $IMAGE_NAME[[:blank:]]|awk '{OFS=":"}{print $1,$2}')"
+  echo "当前使用镜像为：$(docker images|grep $IMAGE_NAME|awk '{OFS=":"}{print $1}')"
 }
 
 case "$1" in