Skip to content

Commit 2eaaf9f

Browse files
authored
Merge pull request #189 from MEITREX/FoPro_WS_UML-Assessment
Update docker again
2 parents 4c3fcf5 + a1e0f7e commit 2eaaf9f

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ FROM node:22-alpine AS base
22

33
# Install dependencies only when needed
44
FROM base AS deps
5-
RUN apk add --no-cache libc6-compat
5+
RUN apk add --no-cache libc6-compat git
66
WORKDIR /app
77

88
COPY package.json pnpm-lock.yaml* ./
9-
RUN yarn global add pnpm && pnpm i --no-frozen-lockfile
10-
9+
# Approve build scripts as needed for dependencies using pnpm
10+
RUN yarn global add pnpm && pnpm approve-builds && pnpm i --no-frozen-lockfile
1111

1212
# Rebuild the source code only when needed
1313
FROM base AS builder
14+
RUN apk add --no-cache git
1415
WORKDIR /app
1516
COPY --from=deps /app/node_modules ./node_modules
1617
COPY . .
@@ -21,11 +22,10 @@ ARG NEXT_PUBLIC_OAUTH_REDIRECT_URL="https://orange.informatik.uni-stuttgart.de"
2122
ARG NEXT_PUBLIC_OAUTH_CLIENT_ID="frontend"
2223
ARG NEXT_PUBLIC_OAUTH_AUTHORITY="https://orange.informatik.uni-stuttgart.de/keycloak/realms/GITS"
2324

24-
RUN yarn global add pnpm@latest-8 \
25+
RUN yarn global add pnpm@latest-8 \
2526
&& mkdir -p ./__generated__ \
2627
&& rm -rf ./mockserver \
27-
&& pnpm run build
28-
28+
&& pnpm run build
2929

3030
# Production image, copy all the files and run next
3131
FROM base AS runner

Dockerfile.k8s

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ RUN apk add --no-cache libc6-compat
66
WORKDIR /app
77

88
COPY package.json pnpm-lock.yaml* ./
9-
RUN yarn global add pnpm && pnpm i --no-frozen-lockfile
9+
RUN yarn global add pnpm && pnpm approve-builds && pnpm i --no-frozen-lockfile
1010

1111

1212
# Rebuild the source code only when needed
1313
FROM base AS builder
14+
RUN apk add --no-cache git
1415
WORKDIR /app
1516
COPY --from=deps /app/node_modules ./node_modules
1617
COPY . .
@@ -22,10 +23,10 @@ ARG NEXT_PUBLIC_OAUTH_CLIENT_ID="frontend"
2223
ARG NEXT_PUBLIC_OAUTH_AUTHORITY="https://meitrex.de/keycloak/realms/GITS"
2324
ARG NEXT_PUBLIC_GITHUB_CLIENT_ID="Iv23li4YaE8QambyYkY8"
2425

25-
RUN yarn global add pnpm@latest-8 \
26+
RUN yarn global add pnpm@latest-8 \
2627
&& mkdir -p ./__generated__ \
2728
&& rm -rf ./mockserver \
28-
&& pnpm run build
29+
&& pnpm run build
2930

3031

3132
# Production image, copy all the files and run next

0 commit comments

Comments
 (0)