From 29afb0d42be9da3cf1a2231599eba64bbc8220cd Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Fri, 15 Mar 2024 18:48:17 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/Dockerfile           | 2 ++
 installer/Dockerfile-python-pg | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/installer/Dockerfile b/installer/Dockerfile
index 5951eaea2..f00b454b7 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -14,6 +14,8 @@ VOLUME /opt/maxkb
 # 拷贝项目
 COPY . /opt/maxkb/app
 COPY installer/config.yaml /opt/maxkb/conf
+ENV POSTGRES_USER root
+ENV POSTGRES_PASSWORD Password123@postgres
 RUN rm -rf /opt/maxkb/app/ui /opt/maxkb/app/build
 COPY --from=vector-model model /opt/maxkb/app/model
 COPY --from=web-build ui /opt/maxkb/app/ui
diff --git a/installer/Dockerfile-python-pg b/installer/Dockerfile-python-pg
index 1bc9f4359..7f884aae6 100644
--- a/installer/Dockerfile-python-pg
+++ b/installer/Dockerfile-python-pg
@@ -10,12 +10,9 @@ COPY installer/init.sql /docker-entrypoint-initdb.d
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone
 
-ENV POSTGRES_USER root
+# ---- install python --- #
+# ---- below content is copied from https://github.com/docker-library/python/blob/master/3.11/slim-bullseye/Dockerfile --- #
 
-ENV POSTGRES_PASSWORD Password123@postgres
-
-# ---- prepare python env --- #
-# ---- below content is copied https://github.com/docker-library/python/blob/master/3.11/slim-bullseye/Dockerfile --- #
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH