From 88fd0e31e0b7db62ad3796e86ceaead00d396434 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 23 Mar 2025 13:03:48 +0800
Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml        | 10 ++++++----
 docker/adminer/build.sh   |  1 +
 docker/mysql/build.sh     |  1 +
 docker/mysql/my.cnf       |  2 +-
 docker/push.sh            |  1 +
 docker/redis/build.sh     |  1 +
 docker/service/Dockerfile |  2 ++
 docker/service/build.sh   |  1 +
 docker/ui/build.sh        |  1 +
 docker/ui/nginx.conf      |  4 ++--
 10 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 99a4d4f0..554775f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
   service:
     image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
     privileged: true
+    ports:
+      - 9200:9200
     environment:
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-prod}
       - MYSQL_HOST=${MYSQL_HOST:-mysql}
@@ -33,8 +35,8 @@ services:
       test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
       interval: 15s
       timeout: 5s
-      retries: 10
-      start_period: 15s
+      retries: 15
+      start_period: 30s
     depends_on:
       mysql:
         condition: service_healthy
@@ -62,7 +64,7 @@ services:
       interval: 15s
       timeout: 5s
       retries: 10
-      start_period: 5s
+      start_period: 10s
     networks:
       - orion-visor-net
 
@@ -82,7 +84,7 @@ services:
       interval: 15s
       timeout: 5s
       retries: 10
-      start_period: 5s
+      start_period: 10s
     networks:
       - orion-visor-net
 
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
index 911d7982..13a832ec 100644
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
index 83afac05..6a86ae67 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
diff --git a/docker/mysql/my.cnf b/docker/mysql/my.cnf
index ac9388c4..5f6867b7 100644
--- a/docker/mysql/my.cnf
+++ b/docker/mysql/my.cnf
@@ -12,7 +12,7 @@ socket=/var/run/mysqld/mysqld.sock
 # 数据目录
 datadir=/var/lib/mysql
 # 不区分大小 0区分 1不区分
-lower_case_table_names=1 
+lower_case_table_names=0
 # 服务器时区
 default-time_zone='+8:00'
 # 服务端字符集
diff --git a/docker/push.sh b/docker/push.sh
index 74d7e1a0..795edce5 100644
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
index beb0ccd7..3d515286 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile
index 1f2d39d2..29501be8 100644
--- a/docker/service/Dockerfile
+++ b/docker/service/Dockerfile
@@ -7,6 +7,8 @@ ARG TZ=Asia/Shanghai
 RUN \
   sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
   apk update && \
+  apk add curl && \
+  apk add fonts-dejavu && \
   apk add tzdata && \
   apk add dmidecode
 # 设置时区
diff --git a/docker/service/build.sh b/docker/service/build.sh
index b863653a..dd50ff64 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 docker build -t orion-visor-service:${version} .
diff --git a/docker/ui/build.sh b/docker/ui/build.sh
index 1e3e306a..a44ba37a 100644
--- a/docker/ui/build.sh
+++ b/docker/ui/build.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -e
 version=2.3.6
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-ui:${version} .
diff --git a/docker/ui/nginx.conf b/docker/ui/nginx.conf
index c8ef796f..e227bc08 100644
--- a/docker/ui/nginx.conf
+++ b/docker/ui/nginx.conf
@@ -27,7 +27,7 @@ server {
     }
 
     location /orion-visor/api {
-        proxy_pass    http://localhost:9200/orion-visor/api;
+        proxy_pass    http://service:9200/orion-visor/api;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -35,7 +35,7 @@ server {
     }
 
      location /orion-visor/keep-alive {
-        proxy_pass    http://localhost:9200/orion-visor/keep-alive;
+        proxy_pass    http://service:9200/orion-visor/keep-alive;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";