From 2073b9089fe9c1eeb95f67f0f03ce219a8220071 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Sat, 18 Nov 2023 00:34:39 +0000 Subject: [PATCH 1/8] chore: Update from ubi8/nodejs-18:1-71 to ubi8/nodejs-18:1-81 Signed-off-by: Nick Boldt --- build/dockerfiles/linux-libc.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index fbe7014c96f..28b5cb187bd 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 From b2f67add1ff4bf7a28296cbb70dd5c63f22948dc Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 20 Nov 2023 16:10:58 +0100 Subject: [PATCH 2/8] install node-gyp globally --- build/dockerfiles/linux-libc.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index 28b5cb187bd..885082b32ba 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -48,6 +48,7 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ && 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 node-gyp@9.4.0 ######################################################### # From 66247d44b05832d8a9fe1523859436f2acf50988 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Mon, 20 Nov 2023 16:13:56 +0100 Subject: [PATCH 3/8] Update linux-libc.Dockerfile --- build/dockerfiles/linux-libc.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index 885082b32ba..ce7c725adfd 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -47,7 +47,7 @@ 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.0 ######################################################### From 229a4271ed25f406b408c070b710ae0f41676ba8 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 20 Nov 2023 17:33:53 -0400 Subject: [PATCH 4/8] Update build/dockerfiles/linux-libc.Dockerfile --- build/dockerfiles/linux-libc.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index ce7c725adfd..1c8e216b2e6 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -48,7 +48,7 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ && 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 node-gyp@9.4.0 + && npm install -g node-gyp@9.4.1 ######################################################### # From 6645ca61ecf3ee88549e617033939636c9b0e52c Mon Sep 17 00:00:00 2001 From: nickboldt Date: Mon, 20 Nov 2023 17:42:28 -0400 Subject: [PATCH 5/8] add node gyp 9.4.1 as a dep; add node/npm/yarn versions as engines Change-Id: I2f7bd96e2fa240ad6161fdb4b1826c4669a66dff Signed-off-by: nickboldt --- package.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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" + } } From 3af326ad746a87a203363ffc1de2694a43b2b626 Mon Sep 17 00:00:00 2001 From: nickboldt Date: Mon, 20 Nov 2023 17:45:25 -0400 Subject: [PATCH 6/8] Add node-gyp to yarn.lock Change-Id: I4314882f4fc4cc8f3a4535d912a9b762edb55356 Signed-off-by: nickboldt --- yarn.lock | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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" + From c39f3c24f8eae254f82a38dd5d5b19955ea3cf7e Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Tue, 21 Nov 2023 11:08:43 +0100 Subject: [PATCH 7/8] remove node-gyp global install --- build/dockerfiles/linux-libc.Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index 1c8e216b2e6..28b5cb187bd 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -47,8 +47,7 @@ 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 node-gyp@9.4.1 + && npm install -g yarn@1.22.17 ######################################################### # From 548dd612dd0b256c83907e651da2abfae92b5007 Mon Sep 17 00:00:00 2001 From: nickboldt Date: Tue, 21 Nov 2023 13:11:24 -0400 Subject: [PATCH 8/8] Revert "remove node-gyp global install" This reverts commit c39f3c24f8eae254f82a38dd5d5b19955ea3cf7e. --- build/dockerfiles/linux-libc.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/dockerfiles/linux-libc.Dockerfile b/build/dockerfiles/linux-libc.Dockerfile index 28b5cb187bd..1c8e216b2e6 100644 --- a/build/dockerfiles/linux-libc.Dockerfile +++ b/build/dockerfiles/linux-libc.Dockerfile @@ -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 ######################################################### #