From 99de3699a85422a797a06494c07396a5bc7a4676 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 16 Apr 2026 12:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pull/9345=E3=80=91fix/linuxkit?= =?UTF-8?q?=E5=AE=89=E8=A3=85locale=EF=BC=8C=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8A=A0=E5=85=A5pgvector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot/jeecg-server-cloud/docker-compose.yml | 13 +++++++++++++ .../jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile | 12 +++++++++++- .../jeecg-demo-cloud-start/Dockerfile | 12 +++++++++++- .../jeecg-system-cloud-start/Dockerfile | 12 +++++++++++- .../jeecg-visual/jeecg-cloud-sentinel/Dockerfile | 12 +++++++++++- .../jeecg-visual/jeecg-cloud-xxljob/Dockerfile | 12 +++++++++++- 6 files changed, 68 insertions(+), 5 deletions(-) diff --git a/jeecg-boot/jeecg-server-cloud/docker-compose.yml b/jeecg-boot/jeecg-server-cloud/docker-compose.yml index ba5d7e5a6..6dd941373 100644 --- a/jeecg-boot/jeecg-server-cloud/docker-compose.yml +++ b/jeecg-boot/jeecg-server-cloud/docker-compose.yml @@ -95,6 +95,19 @@ services: networks: - jeecg-boot + jeecg-boot-pgvector: + image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/pgvector + container_name: jeecg-boot-pgvector + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: vector_db +# ports: +# - 5432:5432 + restart: always + networks: + - jeecg-boot + networks: jeecg-boot: name: jeecg_boot diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile index a5e8e7f4c..a4e8debb4 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile @@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 +RUN yum install -y --setopt=tsflags=nodocs \ + glibc-langpack-en \ + glibc-common \ + && yum clean all + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" + RUN mkdir -p /jeecg-cloud-nacos WORKDIR /jeecg-cloud-nacos @@ -12,4 +22,4 @@ EXPOSE 8848 ADD ./target/jeecg-cloud-nacos-3.9.1.jar ./ -CMD sleep 30;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.9.1.jar \ No newline at end of file +CMD sleep 30 && exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.9.1.jar \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile index f5905c715..ebed8e06c 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile +++ b/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile @@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 +RUN yum install -y --setopt=tsflags=nodocs \ + glibc-langpack-en \ + glibc-common \ + && yum clean all + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" + RUN mkdir -p /jeecg-demo-cloud WORKDIR /jeecg-demo-cloud @@ -12,4 +22,4 @@ EXPOSE 7002 ADD ./target/jeecg-demo-cloud-start-3.9.1.jar ./ -CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.9.1.jar +CMD sleep 60 && exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.9.1.jar diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile index c3bde9e17..a354335d8 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile +++ b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile @@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 +RUN yum install -y --setopt=tsflags=nodocs \ + glibc-langpack-en \ + glibc-common \ + && yum clean all + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" + RUN mkdir -p /jeecg-system-cloud WORKDIR /jeecg-system-cloud @@ -12,4 +22,4 @@ EXPOSE 7001 ADD ./target/jeecg-system-cloud-start-3.9.1.jar ./ -CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.9.1.jar \ No newline at end of file +CMD sleep 60 && exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.9.1.jar \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile index 00070f742..95ef2747a 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile @@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 +RUN yum install -y --setopt=tsflags=nodocs \ + glibc-langpack-en \ + glibc-common \ + && yum clean all + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" + RUN mkdir -p /jeecg-cloud-sentinel WORKDIR /jeecg-cloud-sentinel @@ -12,4 +22,4 @@ EXPOSE 8848 ADD ./target/jeecg-cloud-sentinel-3.9.1.jar ./ -CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.9.1.jar +CMD sleep 5 && exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.9.1.jar diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile index f82133ff9..2fc4fa501 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile @@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 +RUN yum install -y --setopt=tsflags=nodocs \ + glibc-langpack-en \ + glibc-common \ + && yum clean all + +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" + RUN mkdir -p /jeecg-cloud-xxljob WORKDIR /jeecg-cloud-xxljob @@ -12,5 +22,5 @@ EXPOSE 9080 ADD ./target/jeecg-cloud-xxljob-3.9.1.jar ./ -CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.9.1.jar +CMD exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.9.1.jar