From a618445a2fb089e50bbf8edc1626ea6a943a066e Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Wed, 26 Feb 2025 17:14:41 +0100
Subject: [PATCH] build: Pin pnpm version

---
 .../build-and-push-release-package.yml         |  2 +-
 Dockerfile                                     | 18 +++++++-----------
 config/development/Dockerfile.client           | 14 ++++++++------
 config/development/Dockerfile.server           |  7 +++----
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build-and-push-release-package.yml b/.github/workflows/build-and-push-release-package.yml
index 3ad17e82..f693e8fc 100644
--- a/.github/workflows/build-and-push-release-package.yml
+++ b/.github/workflows/build-and-push-release-package.yml
@@ -16,7 +16,7 @@ jobs:
           cache: 'npm'
 
       - name: Workflow install pnpm
-        run: npm install pnpm -g
+        run: npm install pnpm@9 -g
 
       - name: Client install dependencies
         run: pnpm install
diff --git a/Dockerfile b/Dockerfile
index 43553d1d..fe28a0c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,14 @@
 FROM node:18-alpine AS server-dependencies
 
 RUN apk -U upgrade \
-  && apk add build-base python3 \
-  --no-cache
+  && apk add build-base python3 --no-cache
 
 WORKDIR /app
 
 COPY server/package.json server/package-lock.json ./
 
 RUN npm install npm --global \
-  && npm install pnpm --global \
+  && npm install pnpm@9 --global \
   && pnpm import \
   && pnpm install --prod
 
@@ -17,28 +16,26 @@ FROM node:lts AS client
 
 WORKDIR /app
 
-COPY client/package.json client/package-lock.json ./
+COPY client .
 
 RUN npm install npm --global \
-  && npm install pnpm --global \
+  && npm install pnpm@9 --global \
   && pnpm import \
   && pnpm install --prod
 
-COPY client .
 RUN DISABLE_ESLINT_PLUGIN=true npm run build
 
 FROM node:18-alpine
 
 RUN apk -U upgrade \
-  && apk add bash \
-  --no-cache
+  && apk add bash --no-cache
 
 USER node
 WORKDIR /app
 
 COPY --chown=node:node start.sh .
-COPY --chown=node:node server .
 COPY --chown=node:node healthcheck.js .
+COPY --chown=node:node server .
 
 RUN mv .env.sample .env
 
@@ -56,5 +53,4 @@ EXPOSE 1337
 HEALTHCHECK --interval=10s --timeout=2s --start-period=15s \
   CMD node ./healthcheck.js
 
-
-CMD [ "bash", "start.sh" ]
+CMD ["./start.sh"]
diff --git a/config/development/Dockerfile.client b/config/development/Dockerfile.client
index 807f63e6..92a271b9 100644
--- a/config/development/Dockerfile.client
+++ b/config/development/Dockerfile.client
@@ -1,18 +1,20 @@
 FROM node:18-alpine AS server-dependencies
 
 RUN apk -U upgrade \
-  && apk add build-base python3 \
-  --no-cache
+  && apk add build-base python3 --no-cache
 
 WORKDIR /app/client
-COPY package.json package-lock.json /app/client/
+
+COPY package.json package-lock.json .
+
 RUN npm install npm --global \
-  && npm install pnpm --global \
+  && npm install pnpm@9 --global \
   && pnpm import \
   && pnpm install
 
+WORKDIR /app
+
+COPY ../../package.json ../../package-lock.json .
 
-WORKDIR /app/
-COPY ../../package.json ../../package-lock.json /app/
 RUN pnpm import \
   && pnpm install
diff --git a/config/development/Dockerfile.server b/config/development/Dockerfile.server
index da85a05a..937d32c3 100644
--- a/config/development/Dockerfile.server
+++ b/config/development/Dockerfile.server
@@ -1,14 +1,13 @@
 FROM node:18-alpine AS server-dependencies
 
 RUN apk -U upgrade \
-  && apk add build-base python3 \
-  --no-cache
+  && apk add build-base python3 --no-cache
 
 WORKDIR /app
 
-COPY package.json package-lock.json ./
+COPY package.json package-lock.json .
 
 RUN npm install npm --global \
-  && npm install pnpm --global \
+  && npm install pnpm@9 --global \
   && pnpm import \
   && pnpm install