From c8acf3ed1a622bb222089e2994be2404480b312a Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Fri, 15 Mar 2024 15:42:27 +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

---
 .github/workflows/build-and-push-python-pg.yml | 4 ++--
 installer/Dockerfile                           | 2 +-
 installer/Dockerfile-python-pg                 | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml
index 478fdbab4..10ecb50a0 100644
--- a/.github/workflows/build-and-push-python-pg.yml
+++ b/.github/workflows/build-and-push-python-pg.yml
@@ -15,8 +15,8 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=ghcr.io/maxkb-dev/python-pg
-          DOCKER_PLATFORMS=linux/amd64,linux/arm64
-          TAG_NAME=python3.11.8-pg15.6
+          DOCKER_PLATFORMS=linux/amd64
+          TAG_NAME=python3.11.8-pg15.3
           DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=version::${TAG_NAME}
diff --git a/installer/Dockerfile b/installer/Dockerfile
index a9094af77..5951eaea2 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -7,7 +7,7 @@ RUN cd ui && \
     npm run build && \
     rm -rf ./node_modules
 
-FROM ghcr.io/maxkb-dev/python-pg:python3.11.8-pg15.6
+FROM ghcr.io/maxkb-dev/python-pg:python3.11.8-pg15.3
 # 创建工作目录
 RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf
 VOLUME /opt/maxkb
diff --git a/installer/Dockerfile-python-pg b/installer/Dockerfile-python-pg
index 6db2a7966..c6bb45b9a 100644
--- a/installer/Dockerfile-python-pg
+++ b/installer/Dockerfile-python-pg
@@ -1,4 +1,4 @@
-FROM postgres:15.6-bookworm
+FROM postgres:15.3-bullseye
 
 ENV LANG=C.UTF-8
 
@@ -15,7 +15,8 @@ ENV POSTGRES_USER root
 ENV POSTGRES_PASSWORD Password123@postgres
 
 # ---- prepare python env --- #
-# ---- below content is copied from https://github.com/docker-library/python/blob/master/3.11/slim-bookworm/Dockerfile --- #
+# ---- 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
 
 # http://bugs.python.org/issue19846