Merge branch 'main' into MNTOR-3074

mozilla · Apr 5, 2024 · d4170a9 · d4170a9
2 parents c114145 + 86a08e4
commit d4170a9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,14 +3,14 @@ version: 2.1
 executors:
     node:
         docker:
-            - image: cimg/node:20.11.0
+            - image: cimg/node:20.12.0
               auth:
                 username: $DOCKER_USER
                 password: $DOCKER_PASS
 
     node_with_python:
         docker:
-            - image: cimg/node:20.11.0
+            - image: cimg/node:20.12.0
               auth:
                 username: $DOCKER_USER
                 password: $DOCKER_PASS
@@ -35,7 +35,7 @@ executors:
                 description: "Which cimg/postgres tag to use"
                 type: string
         docker:
-            - image: cimg/node:20.11
+            - image: cimg/node:20.12
               auth:
                 username: $DOCKER_USER
                 password: $DOCKER_PASS

diff --git a/.github/workflows/e2e_cron.yml b/.github/workflows/e2e_cron.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.11
+          node-version: 20.12
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/e2e_pr.yml b/.github/workflows/e2e_pr.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.11
+          node-version: 20.12
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20.11.x'
+          node-version: '20.12.x'
       - run: npm ci
       - run: cp .env-dist .env
       - run: npm test

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.11-alpine
+FROM node:20.12-alpine
 
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app

diff --git a/netlify.toml b/netlify.toml
@@ -18,4 +18,4 @@
   # Default build command.
   command = "npm ci; cp .env-dist .env; npm run build-storybook"
 
-  environment = { NODE_VERSION = "20.11.0", NPM_VERSION = "10.2.4" }
+  environment = { NODE_VERSION = "20.12.0", NPM_VERSION = "10.2.4" }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Firefox Monitor",
   "engines": {
-    "node": "20.11.x",
+    "node": "20.12.x",
     "npm": "10.2.x"
   },
   "type": "module",
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/mozilla/blurts-server",
   "license": "MPL-2.0",
   "volta": {
-    "node": "20.11.0",
+    "node": "20.12.0",
     "npm": "10.2.4"
   },
   "dependencies": {