From 6b60c9d495fec22ce826d54768052acf979b2302 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:52:39 -0800
Subject: [PATCH] Not quite working, it's building not using the wheels
---
.github/workflows/ci.yml | 2 +-
Dockerfile | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57bbdd865..fe3615cd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
with:
version: ${{ env.DEFAULT_UV_VERSION }}
enable-cache: true
- cache-suffix: "docs"
+ cache-suffix: "docs-${{ env.DEFAULT_PYTHON_VERSION }}"
-
name: Install Python dependencies
run: |
diff --git a/Dockerfile b/Dockerfile
index e23429d3d..063b1d0c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -215,18 +215,19 @@ ARG ZXING_VERSION=2.3.0
ARG PSYCOPG_VERSION=3.2.4
# hadolint ignore=DL3042
-RUN --mount=type=cache,target=/root/.cache/uv,id=pip-cache \
- set -eux \
+RUN set -eux \
&& echo "Installing build system packages" \
&& apt-get update \
- && apt-get install --yes --quiet --no-install-recommends ${BUILD_PACKAGES} \
- && echo "Installing Python requirements" \
+ && apt-get install --yes --quiet --no-install-recommends ${BUILD_PACKAGES}
+RUN echo "Installing Python requirements" \
&& curl --fail --silent --no-progress-meter --show-error --location --remote-name-all --parallel --parallel-max 4 \
https://github.com/paperless-ngx/builder/releases/download/psycopg-${PSYCOPG_VERSION}/psycopg_c-${PSYCOPG_VERSION}-cp312-cp312-linux_x86_64.whl \
https://github.com/paperless-ngx/builder/releases/download/psycopg-${PSYCOPG_VERSION}/psycopg_c-${PSYCOPG_VERSION}-cp312-cp312-linux_aarch64.whl \
https://github.com/paperless-ngx/builder/releases/download/zxing-${ZXING_VERSION}/zxing_cpp-${ZXING_VERSION}-cp312-cp312-linux_aarch64.whl \
https://github.com/paperless-ngx/builder/releases/download/zxing-${ZXING_VERSION}/zxing_cpp-${ZXING_VERSION}-cp312-cp312-linux_x86_64.whl \
- && uv sync --no-progress --frozen --no-dev --no-python-downloads --python-preference system --find-links . \
+ && ls -ahl . \
+ && uv lock --find-links ./ \
+ && uv sync --verbose --frozen --no-dev --no-python-downloads --python-preference system --find-links ./ --no-build-package zxing-cpp --no-build-package psycopg-c \
&& chown -R 1000:1000 .venv \
&& echo "Installing NLTK data" \
&& python3 -W ignore::RuntimeWarning -m nltk.downloader -d "/usr/share/nltk_data" snowball_data \