From 4fe86b731da0515820a16db1b231e23da762c0fa Mon Sep 17 00:00:00 2001 From: Isaac Lewis Date: Tue, 16 Jan 2024 22:54:44 -0800 Subject: [PATCH] source python env in run --- docker/Dockerfile | 8 +++++--- docker/run.sh | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 51e54e478c..f01ebf6561 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ RUN apk add --update \ bash \ python3 \ libressl-dev \ - py3-pip \ + pipx \ curl \ gnupg \ unzip \ @@ -59,10 +59,12 @@ RUN mkdir adobe-fonts RUN find $PWD/ -name "*.ttf" -exec install -m644 {} adobe-fonts/ \; || return 1 RUN rm -rf $PWD/source* -RUN pip install dicttoxml2 --break-system-packages - FROM base_${WITH_CERT} as pandoc_base +ENV PATH /root/.py-env:$PATH +RUN python3 -m venv /root/.py-env --system-site-packages +RUN /root/.py-env/bin/pip install dicttoxml2 + #install Pandoc RUN adduser -s /bin/bash -g "pandoc" -D pandoc diff --git a/docker/run.sh b/docker/run.sh index 001a90b53a..ec03a062ec 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -1,5 +1,7 @@ #! /bin/bash +. ~/.py-env/bin/activate + case $TARGET in 4.0) ./generate-all.sh $LANGS