Skip to content

Commit

Permalink
Merge pull request #3385 from uktrade/fix/bump-node
Browse files Browse the repository at this point in the history
Update node 16 -> 18
  • Loading branch information
JamesPRobinson authored Dec 5, 2024
2 parents c4077ce + 42d5fab commit a097896
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
docker-test-unit-js:
working_directory: ~/repo/dataworkspace/dataworkspace/static/js
docker:
- image: cimg/node:16.20
- image: cimg/node:18.20.4
steps:
- checkout:
path: ~/repo
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS builder
FROM node:18-alpine AS builder
WORKDIR /app
COPY dataworkspace/dataworkspace/static/js .
RUN npm ci --include=dev
Expand Down Expand Up @@ -121,4 +121,4 @@ FROM base AS live

CMD ["/dataworkspace/start.sh"]

USER django
USER django
3 changes: 3 additions & 0 deletions dataworkspace/dataworkspace/static/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"resolutions": {
"cross-spawn": " 7.0.6"
},
"engines": {
"node": "18"
},
"dependencies": {
"aws-sdk": "^2.1193.0",
"ckeditor5": "^43.1.1",
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
"bugs": {
"url": "https://github.com/uktrade/data-workspace/issues"
},
"engines": {
"node": "18"
},
"homepage": "https://github.com/uktrade/data-workspace#readme",
"devDependencies": {
"@testing-library/cypress": "^10.0.1",
Expand Down

0 comments on commit a097896

Please sign in to comment.