Skip to content

Commit

Permalink
Merge pull request #390 from NDLANO/node-18
Browse files Browse the repository at this point in the history
Use node 18
  • Loading branch information
gunnarvelle authored Nov 16, 2023
2 parents 6467ed8 + bfde2a6 commit 4a0bb6b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ env:
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
NDLA_RELEASES: ${{ secrets.NDLA_RELEASES }}
GH_TOKEN: ${{ secrets.CI_NOW_GH_TOKEN }}
NOW_TOKEN: ${{ secrets.NOW_TOKEN }}
GH_PR_NUMBER: ${{ github.event.number }}
GH_PR_REPO: ${{ github.event.pull_request.head.repo.full_name }}
GH_PR_SHA: ${{ github.event.pull_request.head.sha }}
Expand All @@ -22,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '18.12'
node-version: '20.6'
- name: "Login to ECR repo"
run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login)
AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Build stage
FROM node:18.12-alpine as builder
FROM node:20.6-alpine as builder

ENV HOME=/home/app
ENV APP_PATH=$HOME/graphql-api
Expand All @@ -18,7 +18,7 @@ COPY src $APP_PATH/src
RUN yarn ncc

### Run stage
FROM node:18.12-alpine
FROM node:20.6-alpine

WORKDIR /home/app/graphql-api
COPY --from=builder /home/app/graphql-api/build/index.js index.js
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"resolutions": {
"@types/serve-static": "1.13.10"
},
"engines": {
"node": ">=20.6.0"
},
"dependencies": {
"@apollo/server": "^4.9.3",
"@graphql-tools/mock": "^8.7.10",
Expand Down

0 comments on commit 4a0bb6b

Please sign in to comment.