Skip to content

Commit 3864188

Browse files
committed
[FIX] Odoo 16.0: handle goarch and dpkg arch output
On ppc64le, the output of `dpkg --print-architecture` is `ppc64el`while the goarch value is `ppc64le`. So wkhtmltopdf would not be installed if the Dockerfile is built on a ppc64le without using the TARGETARCH arg. With this commit, this case is also handled.
1 parent 9024ebe commit 3864188

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

16.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN apt-get update && \
4343
case ${TARGETARCH} in \
4444
"amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \
4545
"arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \
46-
"ppc64le") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \
46+
"ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \
4747
esac \
4848
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bullseye_${WKHTMLTOPDF_ARCH}.deb \
4949
&& echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \

0 commit comments

Comments
 (0)