diff --git a/.nvmrc b/.nvmrc index a77793ecc..1c9aeda80 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -lts/hydrogen +22.23.0 diff --git a/apps/google-analytics-4/lambda/Dockerfile b/apps/google-analytics-4/lambda/Dockerfile index 4a7903d6e..b682899fa 100644 --- a/apps/google-analytics-4/lambda/Dockerfile +++ b/apps/google-analytics-4/lambda/Dockerfile @@ -1,5 +1,6 @@ # pull official base image -FROM node:20-buster-slim +ARG NODE_VERSION +FROM node:${NODE_VERSION}-buster-slim # set working directory WORKDIR /usr/src/app diff --git a/apps/google-analytics-4/lambda/docker-compose.yml b/apps/google-analytics-4/lambda/docker-compose.yml index aba52ead5..943d78a12 100644 --- a/apps/google-analytics-4/lambda/docker-compose.yml +++ b/apps/google-analytics-4/lambda/docker-compose.yml @@ -40,6 +40,9 @@ services: build: context: . dockerfile: Dockerfile + # NODE_VERSION is sourced from .nvmrc: NODE_VERSION=$(cat .nvmrc) docker compose build + args: + NODE_VERSION: ${NODE_VERSION} volumes: - '.:/usr/src/app' ports: diff --git a/apps/slack/lambda/Dockerfile b/apps/slack/lambda/Dockerfile index 21d84fab4..8c0899ac4 100644 --- a/apps/slack/lambda/Dockerfile +++ b/apps/slack/lambda/Dockerfile @@ -1,4 +1,5 @@ -FROM node:21-alpine AS base +ARG NODE_VERSION +FROM node:${NODE_VERSION}-alpine AS base # set working directory WORKDIR /usr/src/app diff --git a/apps/slack/lambda/docker-compose.yml b/apps/slack/lambda/docker-compose.yml index 75cfd6f1d..d558b8e08 100644 --- a/apps/slack/lambda/docker-compose.yml +++ b/apps/slack/lambda/docker-compose.yml @@ -42,6 +42,9 @@ services: context: . dockerfile: Dockerfile target: base + # NODE_VERSION is sourced from .nvmrc: NODE_VERSION=$(cat .nvmrc) docker compose build + args: + NODE_VERSION: ${NODE_VERSION} volumes: - '.:/usr/src/app' ports: diff --git a/examples/typescript-github-action/.github/workflows/deploy.yml b/examples/typescript-github-action/.github/workflows/deploy.yml index b40111332..09497a4a1 100644 --- a/examples/typescript-github-action/.github/workflows/deploy.yml +++ b/examples/typescript-github-action/.github/workflows/deploy.yml @@ -7,10 +7,10 @@ jobs: if: contains(github.ref, 'main') || contains(github.ref, 'master') steps: - uses: actions/checkout@v3 - - name: Use Node.js 16.x + - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version-file: .nvmrc - run: npm ci - run: npm run build - uses: contentful/actions-app-deploy@v1 diff --git a/package.json b/package.json index 85bd3875d..fd69f4e37 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "private": true, "type": "module", "engines": { - "node": ">=16.0.0", "npm": ">=8.0.0" }, "devDependencies": {