From 48589fa023a77e51dcc69c7af72c5a7308fa69b7 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 7 Sep 2022 22:34:45 +0200 Subject: [PATCH] fix: Use custom `node_netlink` fork (for now) to fix linkstats Signed-off-by: Christoph Heiss --- Dockerfile | 4 ++++ package-lock.json | 25 ++++++++++++------------- package.json | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfe9cec..b14abf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,10 @@ WORKDIR /app # 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 +# 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 ./ RUN npm clean-install && npm install sharp diff --git a/package-lock.json b/package-lock.json index 55da89e..78e41b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "blake2b": "^2.1.4", "iron-session": "^6.1.3", "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", "objection": "^3.0.1", "preact": "^10.7.3", @@ -4061,10 +4061,10 @@ } }, "node_modules/netlink": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/netlink/-/netlink-0.2.2.tgz", - "integrity": "sha512-n1/Tk9Vw7Vpmp4gMv/GsfMZYHHGnxU9TI8QDWbeAEC/yFZUP22HwfjAwn+4w9xKSUrj9lFzJKumoXlzf97nvCQ==", + "version": "0.2.4", + "resolved": "git+ssh://git@github.com/christoph-heiss/node_netlink.git#5a2fb86541638b80c01f12b371dfe654fa140a2d", "hasInstallScript": true, + "license": "MIT", "dependencies": { "@types/node": "^12.0.0", "node-addon-api": "*", @@ -4194,9 +4194,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz", + "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==", "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", @@ -9276,9 +9276,8 @@ "optional": true }, "netlink": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/netlink/-/netlink-0.2.2.tgz", - "integrity": "sha512-n1/Tk9Vw7Vpmp4gMv/GsfMZYHHGnxU9TI8QDWbeAEC/yFZUP22HwfjAwn+4w9xKSUrj9lFzJKumoXlzf97nvCQ==", + "version": "git+ssh://git@github.com/christoph-heiss/node_netlink.git#5a2fb86541638b80c01f12b371dfe654fa140a2d", + "from": "netlink@git://github.com/christoph-heiss/node_netlink.git#rt/linkstats-abi-compat", "requires": { "@types/node": "^12.0.0", "node-addon-api": "*", @@ -9399,9 +9398,9 @@ } }, "node-gyp-build": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz", - "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz", + "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==" }, "node-releases": { "version": "2.0.5", diff --git a/package.json b/package.json index ef7052e..048e9d5 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "blake2b": "^2.1.4", "iron-session": "^6.1.3", "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", "objection": "^3.0.1", "preact": "^10.7.3",