chore: update node base images (#54026)

This commit is contained in:
Oliver Eyton-Williams
2024-03-11 10:51:02 +01:00
committed by GitHub
parent 37414aaf18
commit 0225713b2a
3 changed files with 8 additions and 11 deletions

View File

@@ -1,5 +1,4 @@
# bookworm was only released on 10-6-2023, so is a little too new. FROM node:20-bookworm AS builder
FROM node:18-bullseye AS builder
# 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
@@ -34,7 +33,7 @@ RUN pnpm build:curriculum
RUN pnpm build:server RUN pnpm build:server
FROM node:18-bullseye AS deps FROM node:20-bookworm AS deps
WORKDIR /home/node/build WORKDIR /home/node/build
COPY --chown=node:node pnpm*.yaml . COPY --chown=node:node pnpm*.yaml .
@@ -46,7 +45,7 @@ RUN npm i -g pnpm@8
RUN pnpm config set dedupe-peer-dependents false RUN pnpm config set dedupe-peer-dependents false
RUN pnpm -F=api-server -F=shared install --prod --ignore-scripts RUN pnpm -F=api-server -F=shared install --prod --ignore-scripts
FROM node:18-alpine FROM node:20-alpine
RUN npm i -g pm2@4 RUN npm i -g pm2@4
USER node USER node
WORKDIR /home/node/fcc WORKDIR /home/node/fcc

View File

@@ -1,5 +1,4 @@
# bookworm was only released on 10-6-2023, so is a little too new. FROM node:20-bookworm AS builder
FROM node:18-bullseye AS builder
RUN apt-get update && apt-get install -y jq 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
@@ -36,7 +35,7 @@ ENV SHOW_NEW_CURRICULUM=$SHOW_NEW_CURRICULUM
RUN pnpm build:curriculum RUN pnpm build:curriculum
RUN pnpm -F=api build RUN pnpm -F=api build
FROM node:18-bullseye AS deps FROM node:20-bookworm AS deps
RUN apt-get update && apt-get install -y jq RUN apt-get update && apt-get install -y jq
WORKDIR /home/node/build WORKDIR /home/node/build
@@ -52,7 +51,7 @@ 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
RUN cd api && npx prisma@$(jq -r '.devDependencies.prisma' < package.json) generate RUN cd api && npx prisma@$(jq -r '.devDependencies.prisma' < package.json) generate
FROM node:18-alpine FROM node:20-alpine
RUN npm i -g pm2@4 RUN npm i -g pm2@4
USER node USER node
WORKDIR /home/node/fcc WORKDIR /home/node/fcc

View File

@@ -1,5 +1,4 @@
# bookworm was only released on 10-6-2023, so is a little too new. FROM node:20-bookworm AS builder
FROM node:18-bullseye AS builder
# 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
@@ -42,7 +41,7 @@ RUN pnpm install -F=shared -F=client -F=ui -F=browser-scripts -F=challenge-parse
--frozen-lockfile --frozen-lockfile
RUN pnpm build:client RUN pnpm build:client
FROM node:18-alpine FROM node:20-alpine
RUN npm i -g serve@13 pm2@4 RUN npm i -g serve@13 pm2@4
USER node USER node
WORKDIR /home/node/client WORKDIR /home/node/client