changeset f2524455c665 in tryton-docker:default
details: https://hg.tryton.org/tryton-docker?cmd=changeset&node=f2524455c665
description:
Pin weasyprint version to < 53
issue10694
review369551002
diffstat:
5.6/Dockerfile | 9 ++++++++-
5.8/Dockerfile | 9 ++++++++-
6.0/Dockerfile | 9 ++++++++-
3 files changed, 24 insertions(+), 3 deletions(-)
diffs (99 lines):
diff -r d3afb2ea11cd -r f2524455c665 5.6/Dockerfile
--- a/5.6/Dockerfile Tue May 18 22:24:47 2021 +0200
+++ b/5.6/Dockerfile Fri Sep 17 10:31:20 2021 +0200
@@ -29,6 +29,7 @@
python3 \
python3-pip \
python3-setuptools \
+ python3-wheel \
uwsgi \
uwsgi-plugin-python3 \
# trytond
@@ -56,6 +57,12 @@
python3-simpleeval \
python3-tz \
python3-zeep \
+ # weasyprint
+ libcairo2 \
+ libpango-1.0-0 \
+ libpangocairo-1.0-0 \
+ libgdk-pixbuf2.0-0 \
+ shared-mime-info \
&& rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir --install-option="-O1" \
@@ -72,7 +79,7 @@
python-stdnum[SOAP] \
# Use wheels as Debian compiled dependencies are too old
&& pip3 install --no-cache-dir \
- weasyprint
+ "weasyprint < 53"
COPY --from=builder-node /package /var/lib/trytond/www
COPY entrypoint.sh /
diff -r d3afb2ea11cd -r f2524455c665 5.8/Dockerfile
--- a/5.8/Dockerfile Tue May 18 22:24:47 2021 +0200
+++ b/5.8/Dockerfile Fri Sep 17 10:31:20 2021 +0200
@@ -29,6 +29,7 @@
python3 \
python3-pip \
python3-setuptools \
+ python3-wheel \
uwsgi \
uwsgi-plugin-python3 \
# trytond
@@ -56,6 +57,12 @@
python3-simpleeval \
python3-tz \
python3-zeep \
+ # weasyprint
+ libcairo2 \
+ libpango-1.0-0 \
+ libpangocairo-1.0-0 \
+ libgdk-pixbuf2.0-0 \
+ shared-mime-info \
&& rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir --install-option="-O1" \
@@ -72,7 +79,7 @@
python-stdnum[SOAP] \
# Use wheels as Debian compiled dependencies are too old
&& pip3 install --no-cache-dir \
- weasyprint
+ "weasyprint < 53"
COPY --from=builder-node /package /var/lib/trytond/www
COPY entrypoint.sh /
diff -r d3afb2ea11cd -r f2524455c665 6.0/Dockerfile
--- a/6.0/Dockerfile Tue May 18 22:24:47 2021 +0200
+++ b/6.0/Dockerfile Fri Sep 17 10:31:20 2021 +0200
@@ -29,6 +29,7 @@
python3 \
python3-pip \
python3-setuptools \
+ python3-wheel \
uwsgi \
uwsgi-plugin-python3 \
# trytond
@@ -57,6 +58,12 @@
python3-simpleeval \
python3-tz \
python3-zeep \
+ # weasyprint
+ libcairo2 \
+ libpango-1.0-0 \
+ libpangocairo-1.0-0 \
+ libgdk-pixbuf2.0-0 \
+ shared-mime-info \
&& rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir --install-option="-O1" \
@@ -73,7 +80,7 @@
python-stdnum[SOAP] \
# Use wheels as Debian compiled dependencies are too old
&& pip3 install --no-cache-dir \
- weasyprint \
+ "weasyprint < 53" \
# Upgrade Pillow as Debian compiled is too old but keep installed
dependencies
&& pip3 install --upgrade --no-cache-dir \
Pillow
