From 66b60654d9889b1ec0baf6b1885c3f0a4f3c858e Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Tue, 1 Nov 2022 12:25:38 -0700 Subject: [PATCH] Fixes missing lxml and tweaks commenting --- build-docker-image.sh | 2 ++ docker-builders/Dockerfile.pikepdf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build-docker-image.sh b/build-docker-image.sh index c7411d962..c43c9886b 100755 --- a/build-docker-image.sh +++ b/build-docker-image.sh @@ -24,6 +24,7 @@ fi 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') 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 qpdf_version=$(jq ".qpdf.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 PIKEPDF_VERSION="${pikepdf_version}" \ --build-arg PILLOW_VERSION="${pillow_version}" \ + --build-arg LXML_VERSION="${lxml_version}" \ --build-arg PSYCOPG2_VERSION="${psycopg2_version}" "${@:2}" . diff --git a/docker-builders/Dockerfile.pikepdf b/docker-builders/Dockerfile.pikepdf index 4248bd334..2594f71f5 100644 --- a/docker-builders/Dockerfile.pikepdf +++ b/docker-builders/Dockerfile.pikepdf @@ -18,7 +18,7 @@ LABEL org.opencontainers.image.description="A intermediate image with pikepdf wh ARG DEBIAN_FRONTEND=noninteractive 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) ARG PILLOW_VERSION ARG LXML_VERSION