jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2025-12-19 18:18:27 -05:00
Code Issues Projects Releases Wiki Activity

fix: pin prisma version when generating (#51566)

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2023-09-19 23:57:03 +02:00
committed by GitHub
parent c1bc0d3f39
commit e4284f0a6f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker/new-api/Dockerfile
View File

@@ -1,5 +1,6 @@
# bookworm was only released on 10-6-2023, so is a little too new. # bookworm was only released on 10-6-2023, so is a little too new.
FROM node:18-bullseye AS builder FROM node:18-bullseye AS builder
RUN apt-get update && apt-get install -y jq
# global installs need root permissions, so have to happen before we switch to # global installs need root permissions, so have to happen before we switch to
# the node user # the node user
RUN npm i -g pnpm@8 RUN npm i -g pnpm@8
@@ -17,8 +18,13 @@ COPY --chown=node:node curriculum/ curriculum/
COPY --chown=node:node client/ client/ COPY --chown=node:node client/ client/
RUN pnpm config set dedupe-peer-dependents false RUN pnpm config set dedupe-peer-dependents false
# While we want to ignore scripts generally, we do need to generate the prisma
# client. Note: npx is the simplest way to generate the client without us having
# to have prisma as a prod dependency. The jq tricks are to ensure we're using
# the right version of prisma.
RUN pnpm install -F=api -F=curriculum -F tools/scripts/build -F challenge-parser \ RUN pnpm install -F=api -F=curriculum -F tools/scripts/build -F challenge-parser \
--frozen-lockfile --frozen-lockfile --ignore-scripts
RUN cd api && npx prisma@$(jq -r '.devDependencies.prisma' < package.json) generate
# The api needs to source curriculum.json and build:curriculum relies on the # The api needs to source curriculum.json and build:curriculum relies on the
# following env vars. # following env vars.
@@ -31,6 +37,7 @@ RUN pnpm build:curriculum
RUN pnpm -F=api build RUN pnpm -F=api build
FROM node:18-bullseye AS deps FROM node:18-bullseye AS deps
RUN apt-get update && apt-get install -y jq
WORKDIR /home/node/build WORKDIR /home/node/build
COPY --chown=node:node pnpm*.yaml . COPY --chown=node:node pnpm*.yaml .
@@ -43,10 +50,7 @@ RUN npm i -g pnpm@8
# consistency. # consistency.
RUN pnpm config set dedupe-peer-dependents false RUN pnpm config set dedupe-peer-dependents false
RUN pnpm install --prod --ignore-scripts -F=shared -F=api --frozen-lockfile RUN pnpm install --prod --ignore-scripts -F=shared -F=api --frozen-lockfile
# While we want to ignore scripts generally, we do need to generate the prisma RUN cd api && npx prisma@$(jq -r '.devDependencies.prisma' < package.json) generate
# client. Note: npx is the simplest way to generate the client without us having
# to have prisma as a prod dependency.
RUN cd api && npx prisma generate
FROM node:18-alpine FROM node:18-alpine
RUN npm i -g pm2@4 RUN npm i -g pm2@4