From 9c2b37ec2946c14c7fa50824fd136b2314fa4c4d Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 28 May 2024 13:13:17 +0800 Subject: [PATCH] =?UTF-8?q?:whale:=20=E8=AE=BE=E7=BD=AE=E6=97=B6=E5=8C=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/orion-visor-mysql/Dockerfile | 10 +++++++++- docker/orion-visor-redis/Dockerfile | 13 +++++++++++++ docker/orion-visor-service/Dockerfile | 8 ++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/docker/orion-visor-mysql/Dockerfile b/docker/orion-visor-mysql/Dockerfile index dac50a1d..26e9dc42 100644 --- a/docker/orion-visor-mysql/Dockerfile +++ b/docker/orion-visor-mysql/Dockerfile @@ -1,9 +1,17 @@ FROM mysql:8.0.28 +# 系统时区 +ARG TZ=Asia/Shanghai +# 设置时区 +RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \ + echo '${TZ}' > /etc/timezone +# 复制配置 +COPY ./my.cnf /etc/mysql/conf.d/my.cnf +# 复制初始化脚本 COPY ./sql/init-1-schema-databases.sql /tmp COPY ./sql/init-2-schema-tables.sql /tmp COPY ./sql/init-3-schema-quartz.sql /tmp COPY ./sql/init-4-data.sql /tmp -COPY ./my.cnf /etc/mysql/conf.d/my.cnf +# 设置初始化脚本 RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \ cat /tmp/init-2-schema-tables.sql >> /tmp/init.sql && \ cat /tmp/init-3-schema-quartz.sql >> /tmp/init.sql && \ diff --git a/docker/orion-visor-redis/Dockerfile b/docker/orion-visor-redis/Dockerfile index a5685a08..cd57df26 100644 --- a/docker/orion-visor-redis/Dockerfile +++ b/docker/orion-visor-redis/Dockerfile @@ -1,4 +1,17 @@ FROM redis:6.0.16-alpine WORKDIR /data +# 系统时区 +ARG TZ=Asia/Shanghai +# 切换源 +RUN \ + echo "" > /etc/apk/repositories && \ + echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \ + echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \ + apk update +# 设置时区 +RUN apk add tzdata && \ + ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \ + echo '${TZ}' > /etc/timezone +# redis 配置 COPY ./redis.conf /tmp RUN cat /tmp/redis.conf > /usr/local/redis.conf diff --git a/docker/orion-visor-service/Dockerfile b/docker/orion-visor-service/Dockerfile index 7364485f..8609e399 100644 --- a/docker/orion-visor-service/Dockerfile +++ b/docker/orion-visor-service/Dockerfile @@ -1,6 +1,7 @@ FROM nginx:alpine USER root -# 时区 +WORKDIR /app +# 系统时区 ARG TZ=Asia/Shanghai # 切换源 RUN \ @@ -12,11 +13,14 @@ RUN \ RUN apk add tzdata && \ ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \ echo '${TZ}' > /etc/timezone +# 添加 jdk RUN apk add openjdk8 +# 删除原 nginx 配置 RUN rm -rf /etc/nginx/conf.d/* -WORKDIR /app +# 复制包 COPY ./orion-visor-launch.jar /app/app.jar COPY ./dist /usr/share/nginx/html COPY ./entrypoint.sh /app/entrypoint.sh COPY ./nginx.conf /etc/nginx/conf.d +# 启动 ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]