diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index fbe7014c96f..1c8e216b2e6 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -7,7 +7,7 @@ # # https://registry.access.redhat.com/ubi8/nodejs-18 -FROM registry.access.redhat.com/ubi8/nodejs-18:1-71 as linux-libc-builder +FROM registry.access.redhat.com/ubi8/nodejs-18:1-81 as linux-libc-builder USER root @@ -47,7 +47,8 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ fi; } \ && yum install -y $LIBSECRET $LIBKEYBOARD curl make cmake gcc gcc-c++ python3.9 git git-core-doc openssh less libX11-devel libxkbcommon bash tar gzip rsync patch \ && yum -y clean all && rm -rf /var/cache/yum \ - && npm install -g yarn@1.22.17 + && npm install -g yarn@1.22.17 \ + && npm install -g node-gyp@9.4.1 ######################################################### # diff --git a/package.json b/package.json index cd5212744bd..7c7a66bd6d8 100644 --- a/package.json +++ b/package.json @@ -10,5 +10,13 @@ "build:min": "cd code && yarn gulp vscode-reh-web-linux-x64-min", "rebuild-native-modules": "cd code && npm rebuild" }, - "license": "EPL-2.0" + "license": "EPL-2.0", + "dependencies": { + "node-gyp": "^9.4.1" + }, + "engines": { + "node": ">= 18.18.2", + "npm": ">= 9.8.1", + "yarn": ">= 1.22.19" + } } diff --git a/yarn.lock b/yarn.lock index fb57ccd13af..f1ceb5c6949 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,3 +2,20 @@ # yarn lockfile v1 +node-gyp@9.4.1: + version "9.4.1" + resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185" + integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" +