Skip to content

Commit

Permalink
chore: upgrade nodejs usage to 22.x (#936)
Browse files Browse the repository at this point in the history
  • Loading branch information
urangel authored Nov 8, 2024
1 parent 6eff7e1 commit e06cbd1
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/static-code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: Install Yarn
run: |
Expand Down
Binary file not shown.
Binary file not shown.
18 changes: 9 additions & 9 deletions DEVREADME.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ More detailed information regarding [contributing](https://github.com/SpecterOps

# Dev Environment Prerequisites

- [Just](https://github.com/casey/just)
- [Python 3.10](https://www.python.org/downloads/)
- [Go 1.23](https://go.dev/dl/)
- [Node 20](https://nodejs.dev/en/download/)
- [Yarn 3.6](https://yarnpkg.com/getting-started/install)
- [Docker Desktop](https://www.docker.com/products/docker-desktop/) (or Docker/Docker Compose compatible runtime)
- [Just](https://github.com/casey/just)
- [Python 3.10](https://www.python.org/downloads/)
- [Go 1.23](https://go.dev/dl/)
- [Node 22](https://nodejs.dev/en/download/)
- [Yarn 3.6](https://yarnpkg.com/getting-started/install)
- [Docker Desktop](https://www.docker.com/products/docker-desktop/) (or Docker/Docker Compose compatible runtime)

# Quick Start

- Run `just init`
- Run `just bh-dev`
- To access the UI, navigate to `http://bloodhound.localhost`. Login with the user `admin` and password that can be found in the log output of the app.
- Run `just init`
- Run `just bh-dev`
- To access the UI, navigate to `http://bloodhound.localhost`. Login with the user `admin` and password that can be found in the log output of the app.
2 changes: 1 addition & 1 deletion cmd/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@types/js-cookie": "^3.0.3",
"@types/lodash": "^4.14.195",
"@types/luxon": "^2.4.0",
"@types/node": "^20.11.29",
"@types/node": "^22.9.0",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/react-router-dom": "^5.3.3",
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/bloodhound.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23-alpine3.20 AS godep
########
# Builder init
################
FROM --platform=$BUILDPLATFORM docker.io/library/node:20-alpine3.20 AS deps
FROM --platform=$BUILDPLATFORM docker.io/library/node:22-alpine3.20 AS deps
ARG version=v999.999.999
ARG checkout_hash=""
ENV SB_LOG_LEVEL=debug
Expand Down
2 changes: 1 addition & 1 deletion tools/docker-compose/ui.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM docker.io/library/node:20-alpine AS base
FROM docker.io/library/node:22-alpine AS base

# Setup
RUN mkdir /.yarn && chmod -R go+w /.yarn
Expand Down
20 changes: 18 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3243,7 +3243,7 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:*, @types/node@npm:^20.11.29":
"@types/node@npm:*":
version: 20.11.29
resolution: "@types/node@npm:20.11.29"
dependencies:
Expand All @@ -3252,6 +3252,15 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^22.9.0":
version: 22.9.0
resolution: "@types/node@npm:22.9.0"
dependencies:
undici-types: ~6.19.8
checksum: c014eb3b8a110f1b87b614a40ef288d13e6b08ae9d5dafbd38951a2eebc24d352dc55330ed9d00c97ee9e64483c3cc14c4aa914c5df7ca7b9eaa1a30b2340dbd
languageName: node
linkType: hard

"@types/parse-json@npm:^4.0.0":
version: 4.0.0
resolution: "@types/parse-json@npm:4.0.0"
Expand Down Expand Up @@ -4296,7 +4305,7 @@ __metadata:
"@types/js-cookie": ^3.0.3
"@types/lodash": ^4.14.195
"@types/luxon": ^2.4.0
"@types/node": ^20.11.29
"@types/node": ^22.9.0
"@types/react": ^18.0.28
"@types/react-dom": ^18.0.11
"@types/react-router-dom": ^5.3.3
Expand Down Expand Up @@ -11231,6 +11240,13 @@ __metadata:
languageName: node
linkType: hard

"undici-types@npm:~6.19.8":
version: 6.19.8
resolution: "undici-types@npm:6.19.8"
checksum: de51f1b447d22571cf155dfe14ff6d12c5bdaec237c765085b439c38ca8518fc360e88c70f99469162bf2e14188a7b0bcb06e1ed2dc031042b984b0bb9544017
languageName: node
linkType: hard

"unique-filename@npm:^3.0.0":
version: 3.0.0
resolution: "unique-filename@npm:3.0.0"
Expand Down

0 comments on commit e06cbd1

Please sign in to comment.