Skip to content

Commit aafcd5e

Browse files
committed
Merge branch 'v2' of github.com:1Panel-dev/MaxKB into v2
2 parents e58a550 + d8cbf0d commit aafcd5e

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

.github/workflows/build-and-push-python-pg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
- name: Checkout
3434
uses: actions/checkout@v4
3535
with:
36-
ref: main
36+
ref: ${{ github.ref_name }}
3737
- name: Prepare
3838
id: prepare
3939
run: |
4040
DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg
4141
DOCKER_PLATFORMS=${{ github.event.inputs.architecture }}
42-
TAG_NAME=python3.11-pg15.8
43-
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
42+
TAG_NAME=python3.11-pg17.4
43+
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
4444
echo ::set-output name=docker_image::${DOCKER_IMAGE}
4545
echo ::set-output name=version::${TAG_NAME}
4646
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \

installer/Dockerfile-python-pg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM python:3.11-slim-bullseye AS python-stage
2+
FROM postgres:17.4-bullseye
3+
4+
ARG DEPENDENCIES=" \
5+
libexpat1-dev \
6+
libffi-dev \
7+
curl \
8+
ca-certificates \
9+
vim \
10+
gettext \
11+
postgresql-17-pgvector \
12+
postgresql-17-age"
13+
14+
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
15+
echo "Asia/Shanghai" > /etc/timezone && \
16+
apt-get update && apt-get install -y --no-install-recommends $DEPENDENCIES && \
17+
apt-get clean all && \
18+
rm -rf /var/lib/apt/lists/*
19+
20+
COPY --from=python-stage /usr/local /usr/local

0 commit comments

Comments
 (0)