c8h4/wgdash
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: Use custom node_netlink fork (for now) to fix linkstats

Browse source 
Signed-off-by: Christoph Heiss <contact@christoph-heiss.at>
This commit is contained in:
Christoph Heiss 2022-09-07 22:34:45 +02:00
parent 7205ef8871
commit 48589fa023
Signed by: c8h4
GPG key ID: 9C82009BEEDEA0FF
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -5,6 +5,10 @@ WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat RUN apk add --no-cache libc6-compat
# Install (temporary) build dependencies for node_netlink.
# Remove this when changes are upstreamed.
RUN apk add --no-cache python3 make g++ linux-headers
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm clean-install && npm install sharp RUN npm clean-install && npm install sharp

25
package-lock.json generated
View file

@ -13,7 +13,7 @@
"blake2b": "^2.1.4", "blake2b": "^2.1.4",
"iron-session": "^6.1.3", "iron-session": "^6.1.3",
"knex": "^2.1.0", "knex": "^2.1.0",
"netlink": "^0.2.2", "netlink": "git://github.com/christoph-heiss/node_netlink.git#rt/linkstats-abi-compat",
"next": "12.1.6", "next": "12.1.6",
"objection": "^3.0.1", "objection": "^3.0.1",
"preact": "^10.7.3", "preact": "^10.7.3",
@ -4061,10 +4061,10 @@
} }
}, },
"node_modules/netlink": { "node_modules/netlink": {
"version": "0.2.2", "version": "0.2.4",
"resolved": "https://registry.npmjs.org/netlink/-/netlink-0.2.2.tgz", "resolved": "git+ssh://git@github.com/christoph-heiss/node_netlink.git#5a2fb86541638b80c01f12b371dfe654fa140a2d",
"integrity": "sha512-n1/Tk9Vw7Vpmp4gMv/GsfMZYHHGnxU9TI8QDWbeAEC/yFZUP22HwfjAwn+4w9xKSUrj9lFzJKumoXlzf97nvCQ==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"node-addon-api": "*", "node-addon-api": "*",
@ -4194,9 +4194,9 @@
} }
}, },
"node_modules/node-gyp-build": { "node_modules/node-gyp-build": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
"integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==", "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==",
"bin": { "bin": {
"node-gyp-build": "bin.js", "node-gyp-build": "bin.js",
"node-gyp-build-optional": "optional.js", "node-gyp-build-optional": "optional.js",
@ -9276,9 +9276,8 @@
"optional": true "optional": true
}, },
"netlink": { "netlink": {
"version": "0.2.2", "version": "git+ssh://git@github.com/christoph-heiss/node_netlink.git#5a2fb86541638b80c01f12b371dfe654fa140a2d",
"resolved": "https://registry.npmjs.org/netlink/-/netlink-0.2.2.tgz", "from": "netlink@git://github.com/christoph-heiss/node_netlink.git#rt/linkstats-abi-compat",
"integrity": "sha512-n1/Tk9Vw7Vpmp4gMv/GsfMZYHHGnxU9TI8QDWbeAEC/yFZUP22HwfjAwn+4w9xKSUrj9lFzJKumoXlzf97nvCQ==",
"requires": { "requires": {
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"node-addon-api": "*", "node-addon-api": "*",
@ -9399,9 +9398,9 @@
} }
}, },
"node-gyp-build": { "node-gyp-build": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
"integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="
}, },
"node-releases": { "node-releases": {
"version": "2.0.5", "version": "2.0.5",

2
package.json
View file

@ -23,7 +23,7 @@
"blake2b": "^2.1.4", "blake2b": "^2.1.4",
"iron-session": "^6.1.3", "iron-session": "^6.1.3",
"knex": "^2.1.0", "knex": "^2.1.0",
"netlink": "^0.2.2", "netlink": "git://github.com/christoph-heiss/node_netlink.git#rt/linkstats-abi-compat",
"next": "12.1.6", "next": "12.1.6",
"objection": "^3.0.1", "objection": "^3.0.1",
"preact": "^10.7.3", "preact": "^10.7.3",