From 2913ddb2e0431fb10a013dd42394842e6fe055bb Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Thu, 10 Jul 2025 14:50:36 +0800 Subject: [PATCH] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/builder/Dockerfile.service | 4 ++-- docker/mysql/Dockerfile | 6 +++++- docker/service/Dockerfile | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker/builder/Dockerfile.service b/docker/builder/Dockerfile.service index 3d09032a..0f1cabba 100644 --- a/docker/builder/Dockerfile.service +++ b/docker/builder/Dockerfile.service @@ -1,5 +1,5 @@ -#FROM --platform=$BUILDPLATFORM maven:3.9.10-eclipse-temurin-8-alpine AS builder -FROM maven:3.9.10-eclipse-temurin-8-alpine AS builder +#FROM --platform=$BUILDPLATFORM maven:3.9-amazoncorretto-8 AS builder +FROM maven:3.9-amazoncorretto-8 AS builder # 设置阿里云镜像加速 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile index d8436866..1d1a78e1 100644 --- a/docker/mysql/Dockerfile +++ b/docker/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETPLATFORM mysql:8.0.28 +FROM --platform=$TARGETPLATFORM mysql:8.4.5 # 系统时区 ARG TZ=Asia/Shanghai @@ -12,3 +12,7 @@ COPY ./mysql/my.cnf /etc/mysql/conf.d/my.cnf # 复制初始化脚本 COPY ./mysql/sql/init-*.sql /docker-entrypoint-initdb.d/ + +# 心跳检测 +HEALTHCHECK --interval=10s --timeout=3s --start-period=3s --retries=3 \ + CMD mysqladmin ping -h localhost -u root --password=${MYSQL_ROOT_PASSWORD} || exit 1 diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 25f3c2fd..b846a739 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -20,5 +20,9 @@ RUN \ # 复制 jar 包 COPY ./service/orion-visor-launch.jar /app/app.jar +# 启动检测 +HEALTHCHECK --interval=15s --timeout=5s --retries=5 --start-period=10s \ + CMD wget -T5 -qO- http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health | grep ok || exit 1 + # 启动 CMD ["java", "-jar", "/app/app.jar"]