From e8d5a4a653351f3fb756067cef3cf1df67511c11 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Mon, 14 Apr 2025 15:47:02 +0800 Subject: [PATCH 1/2] build: add Dockerfile-python-pg --- .../workflows/build-and-push-python-pg.yml | 2 +- installer/Dockerfile-python-pg | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 installer/Dockerfile-python-pg diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index bc4dc3f2c..920131206 100644 --- a/.github/workflows/build-and-push-python-pg.yml +++ b/.github/workflows/build-and-push-python-pg.yml @@ -39,7 +39,7 @@ jobs: run: | DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg DOCKER_PLATFORMS=${{ github.event.inputs.architecture }} - TAG_NAME=python3.11-pg15.8 + TAG_NAME=python3.11-pg17.4 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-python-pg b/installer/Dockerfile-python-pg new file mode 100644 index 000000000..b7bc2d588 --- /dev/null +++ b/installer/Dockerfile-python-pg @@ -0,0 +1,20 @@ +FROM python:3.11-slim-bullseye AS python-stage +FROM postgres:17.4-bullseye + +ARG DEPENDENCIES=" \ + libexpat1-dev \ + libffi-dev \ + curl \ + ca-certificates \ + vim \ + gettext \ + postgresql-17-pgvector \ + postgresql-17-age" + +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo "Asia/Shanghai" > /etc/timezone && \ + apt-get update && apt-get install -y --no-install-recommends $DEPENDENCIES && \ + apt-get clean all && \ + rm -rf /var/lib/apt/lists/* + +COPY --from=python-stage /usr/local /usr/local \ No newline at end of file From d8cbf0d8794634c8961e72d26f28980fa92ced0d Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Mon, 14 Apr 2025 15:57:40 +0800 Subject: [PATCH 2/2] build: add Dockerfile-python-pg --- .github/workflows/build-and-push-python-pg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index 920131206..53aa56714 100644 --- a/.github/workflows/build-and-push-python-pg.yml +++ b/.github/workflows/build-and-push-python-pg.yml @@ -33,14 +33,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: main + ref: ${{ github.ref_name }} - name: Prepare id: prepare run: | DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg DOCKER_PLATFORMS=${{ github.event.inputs.architecture }} TAG_NAME=python3.11-pg17.4 - DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" + DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}" echo ::set-output name=docker_image::${DOCKER_IMAGE} echo ::set-output name=version::${TAG_NAME} echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \