diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index 1eb12cf41..6b7991633 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.6 + TAG_NAME=python3.11-pg15.8 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/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 602b51387..9bfc3bcba 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -5,7 +5,7 @@ on: inputs: dockerImageTag: description: 'Docker Image Tag' - default: 'v1.1.0-dev' + default: 'v1.6.0-dev' required: true architecture: description: 'Architecture' diff --git a/installer/Dockerfile b/installer/Dockerfile index 937e72e52..f3d6121d6 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -5,7 +5,7 @@ RUN cd ui && \ npm install && \ npm run build && \ rm -rf ./node_modules -FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.6 AS stage-build +FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.8 AS stage-build ARG DEPENDENCIES=" \ python3-pip" @@ -28,7 +28,7 @@ RUN python3 -m venv /opt/py3 && \ if [ "$(uname -m)" = "x86_64" ]; then sed -i 's/^torch.*/torch = {version = "^2.2.1+cpu", source = "pytorch"}/g' pyproject.toml; fi && \ poetry install -FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.6 +FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.8 ARG DOCKER_IMAGE_TAG=dev \ BUILD_AT \ GITHUB_COMMIT diff --git a/installer/Dockerfile-python-pg b/installer/Dockerfile-python-pg index eb2501468..155bf72d0 100644 --- a/installer/Dockerfile-python-pg +++ b/installer/Dockerfile-python-pg @@ -1,14 +1,17 @@ -FROM postgres:15.6-bookworm +FROM python:3.11-slim-bullseye AS python-stage +FROM postgres:15.8-bullseye ARG DEPENDENCIES=" \ + libexpat1-dev \ + libffi-dev \ curl \ vim \ - python3.11-mini \ - python3.11-venv \ postgresql-15-pgvector" 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/* \ No newline at end of file + rm -rf /var/lib/apt/lists/* + +COPY --from=python-stage /usr/local /usr/local \ No newline at end of file