Skip to content

Commit

Permalink
Merge pull request #343 from digital-sustainability/fixDeps
Browse files Browse the repository at this point in the history
Fix deps, unlimit nofile, update npm & node Version
  • Loading branch information
holdan-8 authored Apr 11, 2024
2 parents 5dd37fe + f8ac834 commit 62fdbcc
Show file tree
Hide file tree
Showing 9 changed files with 12,119 additions and 21,585 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ jobs:
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
containerfiles: Dockerfile
build-args: --ulimit nofile=65535:65535
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM node:20.6.0-alpine3.17 as backendBuild
FROM node:20.12.2-alpine3.18 as backendBuild
LABEL stage=build
ENV NODE_ENV=PRODUCTION

COPY oss-api/ ./

WORKDIR /oss-api

RUN npm install -g [email protected]

RUN npm install

RUN npm run build

FROM node:20.6.0-alpine3.17 as frontendBuild
FROM node:20.12.2-alpine3.18 as frontendBuild
LABEL stage=build
ENV NODE_ENV=PRODUCTION

Expand All @@ -20,11 +22,13 @@ RUN cd /frontend/

WORKDIR /frontend/

RUN npm install -g [email protected]

RUN npm install

RUN npm run build:prod

FROM node:20.6.0-alpine3.17 as prod
FROM node:20.12.2-alpine3.18 as prod

COPY --from=backendBuild dist dist

Expand Down
11 changes: 6 additions & 5 deletions client/index.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion client/main.bc4254dee0843aa8.js

This file was deleted.

1 change: 0 additions & 1 deletion client/polyfills.319a41eb31bd2ed7.js

This file was deleted.

1 change: 0 additions & 1 deletion client/styles.469f924772589a32.css

This file was deleted.

13,277 changes: 234 additions & 13,043 deletions frontend/package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"@nguniversal/builders": "^16.1.1",
"@types/d3": "^6.2.0",
"@types/express": "^4.17.0",
"@types/inputmask": "5.0.0",
"@types/node": "^12.11.1",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
Expand Down
Loading

0 comments on commit 62fdbcc

Please sign in to comment.