From e55d7a8c6a16b29e56060414fa78a13923c8947f Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 5 Jan 2021 17:48:54 +0530 Subject: [PATCH] fix(frappe-worker): default to amd64 as arch --- build/frappe-worker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index 56c4e522..14d6a266 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -6,6 +6,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS -1/' /etc/login.defs \ && useradd -ms /bin/bash frappe ARG GIT_BRANCH=develop +ARG ARCH=amd64 ENV PYTHONUNBUFFERED 1 ENV NVM_DIR=/home/frappe/.nvm ENV NODE_VERSION=12.20.0 @@ -19,6 +20,7 @@ RUN apt-get update -y && apt-get install \ postgresql-client \ gettext-base \ wget \ + curl \ # for PDF fonts-cantarell \ libffi-dev \ @@ -36,8 +38,8 @@ RUN apt-get update -y && apt-get install \ # For psycopg2 libpq-dev \ wait-for-it -y \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_arm64.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_arm64.deb && rm wkhtmltox_0.12.6-1.buster_arm64.deb \ + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb \ + && dpkg -i wkhtmltox_0.12.6-1.buster_${ARCH}.deb && rm wkhtmltox_0.12.6-1.buster_${ARCH}.deb \ && wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh \ && apt-get purge -y wget && apt-get autoremove -y \ && chown -R frappe:frappe /home/frappe