Merge branch 'main' into vrslev/issue697

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.5.1
+    rev: v2.6.0
     hooks:
       - id: prettier
 

docs/docker-swarm.md

@@ -52,4 +52,4 @@ Notes:
 
 #### Site Operations
 
-Refer [site operations documentation](./site-operations) to create new site, migrate site, drop site and perform other site operations.
+Refer [site operations documentation](./site-operations.md) to create new site, migrate site, drop site and perform other site operations.

docs/images-and-compose-files.md

@@ -51,6 +51,8 @@ It is quite simple to run overrides. All we need to do is to specify compose fil
 docker-compose -f compose.yaml -f overrides/compose.erpnext.yaml config
 ```
 
+⚠ Make sure to use docker-compose v2 (run `docker-compose -v` to check). If you want to use v1 make sure the correct `$`-signs as they get duplicated by the `config` command!
+
 That's it! Of course, we also have to setup `.env` before all of that, but that's not the point.
 
 ## Configuration

example.env

@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-FRAPPE_VERSION=v13.22.1
+FRAPPE_VERSION=v13.22.2
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.22.1

images/worker/Dockerfile

@@ -59,9 +59,20 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 FROM base as configured_base
 
+ARG WKHTMLTOPDF_VERSION=0.12.6-1
+
 RUN apt-get update \
+    # Setup Node lists
     && apt-get install --no-install-recommends -y curl \
     && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    # Install wkhtmltopdf with patched qt
+    && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
+    && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
+    && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \
+    && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
+    && apt-get install -y ./$downloaded_file \
+    && rm $downloaded_file \
+    # Cleanup
     && apt-get purge -y --auto-remove curl \
     && apt-get update \
     && apt-get install --no-install-recommends -y \
@@ -69,10 +80,6 @@ RUN apt-get update \
     mariadb-client \
     # Postgres
     postgresql-client \
-    # wkhtmltopdf
-    xvfb \
-    libfontconfig \
-    wkhtmltopdf \
     # For healthcheck
     wait-for-it \
     jq \