Skip to content

Commit

Permalink
Merge pull request #4948 from mozilla/dependabot/docker/node-22.6-alpine
Browse files Browse the repository at this point in the history
chore(deps): bump node from 22.5-alpine to 22.6-alpine
  • Loading branch information
mansaj authored Aug 28, 2024
2 parents 8ffc71b + 8c1e2f7 commit cba6a0b
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '22.5.x'
node-version: '22.6.x'
- run: npm ci
- run: npm run build-glean
# Verify that the build (incl. type-checking) succeeds
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22.5.x
node-version: 22.6.x

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22.5.x
node-version: 22.6.x

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '22.5.x'
node-version: '22.6.x'
- run: npm ci
- run: npm run build-glean
- run: npm run build-nimbus
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '22.5.x'
node-version: '22.6.x'
- run: npm ci
- run: npm run build-glean
- run: npm test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.5-alpine
FROM node:22.6-alpine

RUN addgroup -g 10001 app && \
adduser -D -G app -h /app -u 10001 app
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cloudrun
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.5-alpine
FROM node:22.6-alpine

RUN addgroup -g 10001 app && \
adduser -D -G app -h /app -u 10001 app
Expand Down
39 changes: 36 additions & 3 deletions docs/dependency-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,43 @@ For example, the unit tests Workflow (`/.github/workflows/unittests.yaml`) uses
the `setup-node` Action, so if that gets updated, the tests should continue to
run, and to result in a failing check if the tests fail.

## Docker
## Docker / Node

TODO: Describe how to verify that an update of the base Docker image doesn't
break the app.
Monitor specifies the official Node:Alpine Docker image, which bundles both the minimalistic
Alpine Linux distribution with the latest version of Node.

GitHub's Dependabot only updates `Dockerfile`, but the Node version is specified in many
different config files. The PR that Dependabot opens will always fail the lint check because
the script `scripts/check-node-version-alignment.js` will fail if the Node version isn't
set consistently across all config files.

1. clone the branch that Dependabot creates

e.g.

```sh
git clone dependabot/docker/node-22.6-alpine
```

2. Run the Node version alignment script and fix any problems it finds

```sh
node scripts/check-node-version-alignment.js
```

3. Commit and push to branch Dependabot opened

e.g.

```sh
git push origin dependabot/docker/node-22.6-alpine
```

Lint on the GitHub PR should now pass and the PR may be merged.

Testing: NOTE This must be pushed to the stage environment and the full e2e test suite must pass
before this is pushed to production. The release notes must be reviewed to determine how
urgent the update is (e.g. security fixes) and if more thorough testing should be performed.

## npm

Expand Down
2 changes: 1 addition & 1 deletion esbuild.cronjobs.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ build({
format: "esm",
outdir: "dist/scripts/cronjobs/",
sourcemap: true,
target: "node22.5",
target: "node22.6",
packages: "external",
});
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# Default build command.
command = "npm ci; npm run build-storybook"

environment = { NODE_VERSION = "22.5.1", NPM_VERSION = "10.8.1" }
environment = { NODE_VERSION = "22.6.0", NPM_VERSION = "10.8.1" }
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"description": "Firefox Monitor",
"engines": {
"node": "22.5.x",
"node": "22.6.x",
"npm": "10.8.x"
},
"type": "module",
Expand Down Expand Up @@ -58,7 +58,7 @@
"homepage": "https://github.com/mozilla/blurts-server",
"license": "MPL-2.0",
"volta": {
"node": "22.5.1",
"node": "22.6.0",
"npm": "10.8.1"
},
"dependencies": {
Expand Down

0 comments on commit cba6a0b

Please sign in to comment.