From 2b57e8a94bf7398650c48ec7f599419f395ec571 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Sun, 25 Aug 2024 05:17:54 +0100
Subject: [PATCH] Try get working deps

---
 packages/website/Dockerfile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/website/Dockerfile b/packages/website/Dockerfile
index f1658265..0ad9a6a2 100644
--- a/packages/website/Dockerfile
+++ b/packages/website/Dockerfile
@@ -2,6 +2,7 @@
 FROM node:latest AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
+ENV CI=1
 RUN corepack enable
 COPY ./../.. /app/
 WORKDIR /app
@@ -10,7 +11,6 @@ WORKDIR /app
 # RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
 
 FROM base AS deps
-ENV CI=1
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 # RUN cd packages/website; --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 FROM deps as build
@@ -18,9 +18,16 @@ RUN cd packages/website; pnpm run build
 
 RUN cd packages/website; pnpm exec rollup -c server-rollup.config.mjs
 # copy node_modules/ and other build files over
-FROM base as deploy-deps
+FROM node:latest as deploy-deps
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
 ENV CI=1
+RUN corepack enable
+
+COPY --from=base /app/packages/website/package.json ./package.json
+COPY --from=base /app/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --prod
+
 FROM node:alpine
 
 WORKDIR /app
@@ -28,8 +35,9 @@ WORKDIR /app
 COPY --from=build /app/packages/website/output .
 COPY --from=build /app/packages/website/build/client ./client/
 COPY --from=build /app/packages/website/build/prerendered ./prerendered/
-COPY --from=build /app/packages/website/package.json ./package.json
+COPY --from=base /app/packages/website/package.json ./package.json
 COPY --from=deploy-deps /app/packages/website/node_modules ./node_modules/
+COPY --from=deploy-deps /app/node_modules/.pnpm ./node_modules/.pnpm/
 
 ENV NODE_ENV production
 EXPOSE 3000