From 68b186f40fc1d73f85cb0fd8cd055f0546f5535a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20D=C3=A9siles?=
 <1536672+jokesterfr@users.noreply.github.com>
Date: Fri, 8 Dec 2023 16:12:53 +0100
Subject: [PATCH] fix(build): env path fix for Node.js

---
 docker/alpine.Dockerfile | 7 ++++---
 docker/debian.Dockerfile | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile
index 2e3b202..7b784f3 100644
--- a/docker/alpine.Dockerfile
+++ b/docker/alpine.Dockerfile
@@ -67,18 +67,19 @@ RUN PHP_CS_FIXER=$(jq -r '."'"${PHP_VERSION}"'".php_cs_fixer' < /tmp/php-flavour
   && chmod a+x /usr/bin/php-cs-fixer
 
 # Install Node.js and pnpm (yarn and npm are included)
+ENV PATH "$PATH:/usr/local/lib/nodejs/bin"
 RUN if [ "0.0.0" = "$NODE_VERSION" ]; then exit 0; fi \
   && apk --no-cache add -U gcompat \
   && if [ "linux/arm64" = "$TARGET_PLATFORM" ]; \
   then export DISTRO="linux-arm64"; \
   else export DISTRO="linux-x64"; \
   fi \
-  && curl --silent --show-error --fail --location --output /tmp/node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${DISTRO}.tar.xz" \
+  && curl --silent --show-error --fail --location --output /tmp/node.tar.xz \
+  "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${DISTRO}.tar.xz" \
   && mkdir -p /tmp/nodejs && tar -xJf /tmp/node.tar.xz -C /tmp/nodejs \
   && mv "/tmp/nodejs/node-v${NODE_VERSION}-${DISTRO}" /usr/local/lib/nodejs \
   && rm -rf /tmp/nodejs /tmp/node.tar.xz \
-  && PATH="$PATH:/usr/local/lib/nodejs/bin" npm install -g yarn@latest pnpm@latest --force
-ENV PATH "$PATH:/usr/local/lib/nodejs/bin"
+  && npm install -g yarn@latest pnpm@latest --force
 
 # --------------------------------
 # Flashlight install and dump SQL
diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile
index aa28433..8c680c6 100644
--- a/docker/debian.Dockerfile
+++ b/docker/debian.Dockerfile
@@ -80,17 +80,18 @@ RUN PHP_CS_FIXER=$(jq -r '."'"${PHP_VERSION}"'".php_cs_fixer' < /tmp/php-flavour
   && chmod a+x /usr/bin/php-cs-fixer
 
 # Install Node.js and pnpm (yarn and npm are included)
+ENV PATH "$PATH:/usr/local/lib/nodejs/bin"
 RUN if [ "0.0.0" = "$NODE_VERSION" ]; then exit 0; fi \
   && if [ "linux/arm64" = "$TARGET_PLATFORM" ]; \
   then export DISTRO="linux-arm64"; \
   else export DISTRO="linux-x64"; \
   fi \
-  && curl --silent --show-error --fail --location --output /tmp/node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${DISTRO}.tar.xz" \
+  && curl --silent --show-error --fail --location --output /tmp/node.tar.xz \
+  "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${DISTRO}.tar.xz" \
   && mkdir -p /tmp/nodejs && tar -xJf /tmp/node.tar.xz -C /tmp/nodejs \
   && mv "/tmp/nodejs/node-v${NODE_VERSION}-${DISTRO}" /usr/local/lib/nodejs \
   && rm -rf /tmp/nodejs /tmp/node.tar.xz \
-  && PATH="$PATH:/usr/local/lib/nodejs/bin" npm install -g yarn@latest pnpm@latest --force
-ENV PATH "$PATH:/usr/local/lib/nodejs/bin"
+  && npm install -g yarn@latest pnpm@latest --force
 
 # --------------------------------
 # Flashlight install and dump SQL