Skip to content

Commit

Permalink
chore: Update from ubi8/nodejs-18:1-71 to ubi8/nodejs-18:1-81 (#305)
Browse files Browse the repository at this point in the history
* chore: Update from ubi8/nodejs-18:1-71 to ubi8/nodejs-18:1-81

Signed-off-by: Nick Boldt <nboldt@redhat.com>

* install node-gyp globally

* Update linux-libc.Dockerfile

* Update build/dockerfiles/linux-libc.Dockerfile

* add node gyp 9.4.1 as a dep; add node/npm/yarn versions as engines

Change-Id: I2f7bd96e2fa240ad6161fdb4b1826c4669a66dff
Signed-off-by: nickboldt <nickboldt@gmail.com>

* Add node-gyp to yarn.lock

Change-Id: I4314882f4fc4cc8f3a4535d912a9b762edb55356
Signed-off-by: nickboldt <nickboldt@gmail.com>

* remove node-gyp global install

* Revert "remove node-gyp global install"

This reverts commit c39f3c2.

---------

Signed-off-by: Nick Boldt <nboldt@redhat.com>
Signed-off-by: nickboldt <nickboldt@gmail.com>
Co-authored-by: Nick Boldt <nboldt@redhat.com>
Co-authored-by: Artem Zatsarynnyi <azatsary@redhat.com>
Co-authored-by: nickboldt <nickboldt@gmail.com>
  • Loading branch information
4 people authored Nov 21, 2023
1 parent ba0e333 commit 3a2d784
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
5 changes: 3 additions & 2 deletions build/dockerfiles/linux-libc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

#########################################################
#
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
17 changes: 17 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 3a2d784

Please sign in to comment.