diff --git a/.dockerignore b/.dockerignore index 7bfd90ff..d8fd0076 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,2 @@ .git* -.idea* -installer/ \ No newline at end of file +.idea* \ No newline at end of file diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index 306b2cca..ea2356ea 100644 --- a/.github/workflows/build-and-push-python-pg.yml +++ b/.github/workflows/build-and-push-python-pg.yml @@ -60,5 +60,4 @@ jobs: password: ${{ secrets.GH_TOKEN }} - name: Docker Buildx (build-and-push) run: | - rm -f .dockerignore docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} -f installer/Dockerfile-base \ No newline at end of file diff --git a/.github/workflows/build-and-push-vector-model.yml b/.github/workflows/build-and-push-vector-model.yml index b344f2d6..b9ec5fa5 100644 --- a/.github/workflows/build-and-push-vector-model.yml +++ b/.github/workflows/build-and-push-vector-model.yml @@ -65,5 +65,4 @@ jobs: password: ${{ secrets.GH_TOKEN }} - name: Docker Buildx (build-and-push) run: | - rm -f .dockerignore docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} -f installer/Dockerfile-vector-model \ No newline at end of file diff --git a/installer/Dockerfile b/installer/Dockerfile index 5adaf618..59607a48 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -31,7 +31,8 @@ RUN python3 -m venv /opt/py3 && \ find /opt/maxkb-app -depth \( -name ".git*" -o -name ".docker*" -o -name ".idea*" -o -name ".editorconfig*" -o -name ".prettierrc*" -o -name "README.md" -o -name "poetry.lock" -o -name "pyproject.toml" \) -exec rm -rf {} + && \ export MAXKB_CONFIG_TYPE=ENV && python3 /opt/maxkb-app/apps/manage.py compilemessages && \ export PIP_TARGET=/opt/maxkb-app/sandbox/python-packages && \ - pip install diskcache2 requests pymysql psycopg2-binary + pip install diskcache2 requests pymysql psycopg2-binary && \ + rm -rf /opt/maxkb-app/installer FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.4 ARG DOCKER_IMAGE_TAG=dev \