From 3864188c94c33dace7d4b5f6767e00a4328fe08c Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 6 Nov 2023 15:16:33 +0100 Subject: [PATCH] [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. --- 16.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/16.0/Dockerfile b/16.0/Dockerfile index 2d4f2a3..db0812f 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update && \ case ${TARGETARCH} in \ "amd64") WKHTMLTOPDF_ARCH=amd64 && WKHTMLTOPDF_SHA=9df8dd7b1e99782f1cfa19aca665969bbd9cc159 ;; \ "arm64") WKHTMLTOPDF_SHA=58c84db46b11ba0e14abb77a32324b1c257f1f22 ;; \ - "ppc64le") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ + "ppc64le" | "ppc64el") WKHTMLTOPDF_ARCH=ppc64el && WKHTMLTOPDF_SHA=7ed8f6dcedf5345a3dd4eeb58dc89704d862f9cd ;; \ esac \ && 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 \ && echo ${WKHTMLTOPDF_SHA} wkhtmltox.deb | sha1sum -c - \