zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: try to fix "Cannot allocate memory".

Browse Source
This commit is contained in:
liqiang-fit2cloud 2024-09-03 15:26:31 +08:00
parent 3e1b6b1585
commit 5f8a03d31e
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-and-push-python-pg.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
run: | run: |
DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg DOCKER_IMAGE=ghcr.io/1panel-dev/maxkb-python-pg
DOCKER_PLATFORMS=${{ github.event.inputs.architecture }} 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" DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
echo ::set-output name=docker_image::${DOCKER_IMAGE} echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo ::set-output name=version::${TAG_NAME} echo ::set-output name=version::${TAG_NAME}

2
.github/workflows/build-and-push.yml vendored
View File

@ -5,7 +5,7 @@ on:
inputs: inputs:
dockerImageTag: dockerImageTag:
description: 'Docker Image Tag' description: 'Docker Image Tag'
default: 'v1.1.0-dev' default: 'v1.6.0-dev'
required: true required: true
architecture: architecture:
description: 'Architecture' description: 'Architecture'

4
installer/Dockerfile
View File

@ -5,7 +5,7 @@ RUN cd ui && \
npm install && \ npm install && \
npm run build && \ npm run build && \
rm -rf ./node_modules 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=" \ ARG DEPENDENCIES=" \
python3-pip" 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 && \ if [ "$(uname -m)" = "x86_64" ]; then sed -i 's/^torch.*/torch = {version = "^2.2.1+cpu", source = "pytorch"}/g' pyproject.toml; fi && \
poetry install 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 \ ARG DOCKER_IMAGE_TAG=dev \
BUILD_AT \ BUILD_AT \
GITHUB_COMMIT GITHUB_COMMIT

11
installer/Dockerfile-python-pg
View File

@ -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=" \ ARG DEPENDENCIES=" \
libexpat1-dev \
libffi-dev \
curl \ curl \
vim \ vim \
python3.11-mini \
python3.11-venv \
postgresql-15-pgvector" postgresql-15-pgvector"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \ echo "Asia/Shanghai" > /etc/timezone && \
apt-get update && apt-get install -y --no-install-recommends $DEPENDENCIES && \ apt-get update && apt-get install -y --no-install-recommends $DEPENDENCIES && \
apt-get clean all && \ apt-get clean all && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
COPY --from=python-stage /usr/local /usr/local