From 3b4b539607c42ec7bb959bc8e03d890a1fc1d277 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 17 Mar 2022 04:05:55 +0000
Subject: [PATCH 1/5] chore: Update example.env

---
 example.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.env b/example.env
index 3ff364e5..91fc8770 100644
--- a/example.env
+++ b/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

From 1dd6e08b4768cdc489c2d0a9bb5ecfecf267712d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 17 Mar 2022 10:22:40 +0300
Subject: [PATCH 2/5] chore(deps): Update pre-commit hooks (#708)

Co-authored-by: vrslev <vrslev@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5bfc245d..40942125 100644
--- a/.pre-commit-config.yaml
+++ b/.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
 

From 10d2172bd83826e5a0a8cbe6ad2a6318911e3573 Mon Sep 17 00:00:00 2001
From: RashiqAzhan <rashiqazhan@gmail.com>
Date: Thu, 17 Mar 2022 13:21:10 +0000
Subject: [PATCH 3/5] Fix broken link in docs. (#710)

---
 docs/docker-swarm.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docker-swarm.md b/docs/docker-swarm.md
index 1efb5177..d7d03fdc 100644
--- a/docs/docker-swarm.md
+++ b/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.

From d4469cfb646c63f40cc16c6ead434edcc34ffade Mon Sep 17 00:00:00 2001
From: Lev <mail@vrslev.com>
Date: Fri, 18 Mar 2022 13:50:39 +0300
Subject: [PATCH 4/5]  fix: Letterheads missing (#704)

* fix: Letterheads missing
Fixes #703

* empty
---
 images/worker/Dockerfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/images/worker/Dockerfile b/images/worker/Dockerfile
index ca79c09a..33e40d1f 100644
--- a/images/worker/Dockerfile
+++ b/images/worker/Dockerfile
@@ -79,9 +79,20 @@ RUN --mount=type=bind,target=/home/frappe/erpnext-wheels,source=/home/frappe/erp
 
 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 \
@@ -89,16 +100,13 @@ RUN apt-get update \
     mariadb-client \
     # Postgres
     postgresql-client \
-    # wkhtmltopdf
-    xvfb \
-    libfontconfig \
-    wkhtmltopdf \
     # For healthcheck
     wait-for-it \
     jq \
     # other
     nodejs \
     && rm -rf /var/lib/apt/lists/*
+
 USER frappe
 
 COPY pretend-bench.sh /usr/local/bin/bench

From 4e1a5641c6c5a634d92d0974241baf22d3fe59ad Mon Sep 17 00:00:00 2001
From: Jonas Weigand <jonas.weigand1604@gmail.com>
Date: Sat, 19 Mar 2022 06:33:11 +0100
Subject: [PATCH 5/5] Update docs to advise for docker-compose v2 (#712)

This change is to inform users to use docker-compose v2. Using v1 can cause problems when parsing the final docker-compose.yaml. Mitigates #701
---
 docs/images-and-compose-files.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/images-and-compose-files.md b/docs/images-and-compose-files.md
index d763e31d..ab3d01e0 100644
--- a/docs/images-and-compose-files.md
+++ b/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