paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-17 10:13:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missing lxml and tweaks commenting

Browse Source
This commit is contained in:
Trenton Holmes 2022-11-01 12:25:38 -07:00 committed by Trenton H
parent b479027f3d
commit 66b60654d9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-docker-image.sh
View File

@ -24,6 +24,7 @@ fi
pikepdf_version=$(jq ".default.pikepdf.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g') pikepdf_version=$(jq ".default.pikepdf.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g')
psycopg2_version=$(jq ".default.psycopg2.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g') psycopg2_version=$(jq ".default.psycopg2.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g')
pillow_version=$(jq ".default.pillow.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g') pillow_version=$(jq ".default.pillow.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g')
lxml_version=$(jq ".default.lxml.version" Pipfile.lock | sed 's/=//g' | sed 's/"//g')
# Read this from the other config file # Read this from the other config file
qpdf_version=$(jq ".qpdf.version" .build-config.json | sed 's/"//g') qpdf_version=$(jq ".qpdf.version" .build-config.json | sed 's/"//g')
jbig2enc_version=$(jq ".jbig2enc.version" .build-config.json | sed 's/"//g') jbig2enc_version=$(jq ".jbig2enc.version" .build-config.json | sed 's/"//g')
@ -42,4 +43,5 @@ docker build --file "$1" \
--build-arg QPDF_VERSION="${qpdf_version}" \ --build-arg QPDF_VERSION="${qpdf_version}" \
--build-arg PIKEPDF_VERSION="${pikepdf_version}" \ --build-arg PIKEPDF_VERSION="${pikepdf_version}" \
--build-arg PILLOW_VERSION="${pillow_version}" \ --build-arg PILLOW_VERSION="${pillow_version}" \
--build-arg LXML_VERSION="${lxml_version}" \
--build-arg PSYCOPG2_VERSION="${psycopg2_version}" "${@:2}" . --build-arg PSYCOPG2_VERSION="${psycopg2_version}" "${@:2}" .

2
docker-builders/Dockerfile.pikepdf
View File

@ -18,7 +18,7 @@ LABEL org.opencontainers.image.description="A intermediate image with pikepdf wh
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG PIKEPDF_VERSION ARG PIKEPDF_VERSION
# These not not used, but will still bust the cache if one changes # These are not used, but will still bust the cache if one changes
# Otherwise, the main image will try to build thing (and fail) # Otherwise, the main image will try to build thing (and fail)
ARG PILLOW_VERSION ARG PILLOW_VERSION
ARG LXML_VERSION ARG LXML_VERSION