Skip to content

Commit 7441be0

Browse files
authored
Merge pull request #164 from dappnode/bump-all-deps
chore: bump all dependencies and upstream Docker images
2 parents 5f201c4 + b48da65 commit 7441be0

12 files changed

Lines changed: 2451 additions & 2531 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ build_*
44
manager/node_modules/
55
manager/dist/
66

7-
staker-metrics/node_modules/
8-
staker-metrics/dist/
7+
stakers-metrics/node_modules/
8+
stakers-metrics/dist/
9+
docker-compose-tmp.yml

‎dappnode_package.json‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,47 @@
77
"upstream": [
88
{
99
"repo": "prometheus/node_exporter",
10-
"version": "v1.10.2",
10+
"version": "v1.11.1",
1111
"arg": "UPSTREAM_VERSION_NODE_EXPORTER"
1212
},
1313
{
1414
"repo": "google/cadvisor",
15-
"version": "0.55.0",
15+
"version": "v0.60.3",
1616
"arg": "UPSTREAM_VERSION_CADVISOR"
1717
},
1818
{
1919
"repo": "prometheus/prometheus",
20-
"version": "v3.8.1",
20+
"version": "v3.13.0",
2121
"arg": "UPSTREAM_VERSION_PROMETHEUS"
2222
},
2323
{
2424
"repo": "grafana/grafana",
25-
"version": "12.3.1",
25+
"version": "13.1.0",
2626
"arg": "UPSTREAM_VERSION_GRAFANA"
2727
},
2828
{
2929
"repo": "grafana/loki",
30-
"version": "3.6.3",
30+
"version": "3.7.3",
3131
"arg": "UPSTREAM_VERSION_LOKI"
3232
}
3333
],
34+
"globalEnvs": [
35+
{
36+
"envs": [
37+
"EXECUTION_CLIENT_MAINNET",
38+
"CONSENSUS_CLIENT_MAINNET",
39+
"EXECUTION_CLIENT_GNOSIS",
40+
"CONSENSUS_CLIENT_GNOSIS",
41+
"EXECUTION_CLIENT_LUKSO",
42+
"CONSENSUS_CLIENT_LUKSO",
43+
"EXECUTION_CLIENT_HOODI",
44+
"CONSENSUS_CLIENT_HOODI",
45+
"EXECUTION_CLIENT_SEPOLIA",
46+
"CONSENSUS_CLIENT_SEPOLIA"
47+
],
48+
"services": ["stakers-metrics"]
49+
}
50+
],
3451
"architectures": ["linux/amd64", "linux/arm64"],
3552
"mainService": "grafana",
3653
"author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",

‎manager/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
##########################
22
# Build Typescript app
33
##########################
4-
FROM --platform=${BUILDPLATFORM:-amd64} node:alpine as build
4+
FROM --platform=${BUILDPLATFORM:-amd64} node:24-alpine3.24 as build
55

66
WORKDIR /app
7+
RUN apk add --no-cache yarn
78
COPY package.json yarn.lock ./
89
RUN yarn --frozen-lockfile --non-interactive --ignore-scripts --ignore-optional
910

@@ -13,7 +14,7 @@ RUN yarn build-webpack
1314
##########################
1415
# Final stage
1516
##########################
16-
FROM alpine
17+
FROM alpine:3.24
1718

1819
WORKDIR /app
1920
RUN apk add --update nodejs && \

‎manager/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"dependencies": {},
1414
"devDependencies": {
15-
"@types/chai": "^4.2.14",
16-
"@types/mocha": "^8.0.4",
17-
"@types/node": "^20.14.2",
18-
"chai": "^4.2.0",
19-
"eslint": "^7.13.0",
20-
"mocha": "^8.2.1",
21-
"prettier": "^2.1.2",
22-
"rimraf": "^5.0.7",
23-
"ts-loader": "^9.5.1",
24-
"typescript": "^5.4.5",
25-
"webpack": "^5.92.0",
26-
"webpack-cli": "^5.1.4"
15+
"@types/chai": "^5.2.3",
16+
"@types/mocha": "^10.0.10",
17+
"@types/node": "^26.1.0",
18+
"chai": "^6.2.2",
19+
"eslint": "^10.6.0",
20+
"mocha": "^11.7.6",
21+
"prettier": "^3.9.4",
22+
"rimraf": "^6.1.3",
23+
"ts-loader": "^9.6.2",
24+
"typescript": "^6.0.3",
25+
"webpack": "^5.108.4",
26+
"webpack-cli": "^7.2.1"
2727
}
2828
}

‎manager/tsconfig.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"target": "ESNext",
66
"sourceMap": true /* Generates corresponding '.map' file. */,
77
"outDir": "dist" /* Redirect output structure to the directory. */,
8-
"downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */,
8+
"rootDir": "./src",
99

1010
/* Strict Type-Checking Options */
1111
"strict": true /* Enable all strict type-checking options. */,
@@ -24,8 +24,9 @@
2424
"noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
2525

2626
/* Module Resolution Options */
27-
"moduleResolution": "node",
27+
"moduleResolution": "bundler",
2828
"esModuleInterop": true,
29+
"types": ["node"],
2930
"useUnknownInCatchVariables": false
3031
},
3132
"include": ["./src/**/*.ts"]

0 commit comments

Comments
 (0)