diff --git a/jeecg-boot/docker-compose.yml b/jeecg-boot/docker-compose.yml index b6e83287d..d6c3b141e 100644 --- a/jeecg-boot/docker-compose.yml +++ b/jeecg-boot/docker-compose.yml @@ -32,19 +32,6 @@ 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 - # jeecg-boot-rabbitmq: # image: rabbitmq:3.7.7-management ## ports: @@ -77,6 +64,19 @@ services: volumes: - ./config:/jeecg-boot/config + 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-module-system/jeecg-system-start/Dockerfile b/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile index 085ef0687..3ac24c670 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile @@ -4,15 +4,22 @@ MAINTAINER jeecgos@163.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -#RUN mkdir -p /jeecg-boot/config/jeecg/ +# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 java:17-anolis基于anolis(CentOS/RHEL 系)应当使用yum +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" WORKDIR /jeecg-boot EXPOSE 8080 -#ADD ./src/main/resources/jeecg ./config/jeecg ADD ./target/jeecg-system-start-3.9.1.jar ./ RUN mkdir -p /jeecg-boot/config -CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-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-start-3.9.1.jar \ No newline at end of file