From 352c13881a92a667e7e99c046c3be4828d87348a Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 10 Apr 2024 11:02:52 +0200
Subject: [PATCH] :bug: Fix exporter dockerfile issue related to yarn update

---
 .yarnrc.yml                       | 2 ++
 docker/images/Dockerfile.exporter | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 896c0eefc..5a0ce9a8b 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -6,4 +6,6 @@ enableImmutableInstalls: false
 
 enableTelemetry: false
 
+httpTimeout: 600000
+
 nodeLinker: node-modules
diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter
index 0c47f63a3..0268324c4 100644
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -90,7 +90,7 @@ RUN set -eux; \
     cd /opt/node; \
     tar -xf /tmp/nodejs.tar.gz --strip-components=1; \
     chown -R root /opt/node; \
-    npm install -g yarn; \
+    corepack enable; \
     rm -rf /tmp/nodejs.tar.gz; \
     mkdir -p /opt/penpot; \
     chown -R penpot:penpot /opt/penpot;
@@ -101,7 +101,8 @@ WORKDIR /opt/penpot/exporter
 USER penpot:penpot
 
 RUN set -ex; \
-    yarn --network-timeout 1000000; \
-    yarn --network-timeout 1000000 run playwright install chromium;
+    yarn config set httpTimeout 600000; \
+    yarn install; \
+    yarn run playwright install chromium;
 
 CMD ["node", "app.js"]