Skip to content

Commit 1e9f8e8

Browse files
committed
fixed dockerfile and upgraded to 4.15
1 parent 342a530 commit 1e9f8e8

8 files changed

Lines changed: 955 additions & 952 deletions

File tree

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ yarn-error.log*
6262

6363
# Lock files (keep package.json though)
6464
package-lock.json
65-
yarn.lock
6665

6766
# Prettier
6867
.prettierrc*

.yarn/releases/yarn-4.11.0.cjs

Lines changed: 0 additions & 942 deletions
This file was deleted.

.yarn/releases/yarn-4.15.0.cjs

Lines changed: 940 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
approvedGitRepositories:
2+
- "**"
3+
14
compressionLevel: mixed
25

36
enableGlobalCache: false
47

8+
enableScripts: true
9+
510
nodeLinker: node-modules
611

712
npmMinimalAgeGate: 4320
813

9-
yarnPath: .yarn/releases/yarn-4.11.0.cjs
14+
yarnPath: .yarn/releases/yarn-4.15.0.cjs

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,5 +180,5 @@
180180
},
181181
"author": "",
182182
"license": "ISC",
183-
"packageManager": "yarn@4.11.0"
183+
"packageManager": "yarn@4.15.0"
184184
}

src/backend/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
22
FROM platformatic/node-caged:25-slim
3-
RUN npm install -g yarn
43

54
WORKDIR /base
65

7-
COPY package.json tsconfig.build.json ./
6+
COPY package.json tsconfig.build.json .yarnrc.yml yarn.lock ./
7+
COPY .yarn/releases .yarn/releases
88
COPY ./src/backend src/backend
99
COPY ./src/shared src/shared
1010

1111
RUN rm -rf src/backend/tests
1212

13-
RUN yarn install --prod;
13+
RUN npm install -g corepack --force && corepack enable && yarn install
1414

1515
RUN echo DATABASE_URL=\"postgresql://postgres:docker@database:5432/nerpm?schema=public\" > ./src/backend/.env
1616
RUN echo NODE_ENV=development >> ./src/backend/.env

src/frontend/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
2-
FROM node:20 AS builder
2+
FROM node:22 AS builder
33

44
WORKDIR /base
55

6-
COPY package.json tsconfig.build.json ./
6+
COPY package.json tsconfig.build.json .yarnrc.yml yarn.lock ./
7+
COPY .yarn/releases .yarn/releases
78
COPY ./src/frontend src/frontend
89
COPY ./src/shared src/shared
910

1011
RUN rm -rf src/frontend/src/tests
1112

12-
RUN yarn install;
13+
RUN npm install -g corepack --force && corepack enable && yarn install
1314

1415
RUN yarn build:shared
1516
RUN yarn build:frontend:dev

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual changes might be lost - proceed with caution!
33

44
__metadata:
5-
version: 8
5+
version: 10
66
cacheKey: 10
77

88
"@adobe/css-tools@npm:^4.4.0":

0 commit comments

Comments
 (0)