Skip to content

Commit 6a0f6d3

Browse files
authored
Merge pull request #1063 from minimum2scp/features/nodejs-20.3.0
nodejs, rails7: nodejs 20.3.0
2 parents 49ab37b + d092a16 commit 6a0f6d3

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

nodejs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# about minimum2scp/nodejs image
22

33
* based on minimum2scp/baseimage (see https://github.com/minimum2scp/dockerfiles/tree/master/baseimage)
4-
* node.js v20.2.0 is installed with [nodenv](https://github.com/nodenv/nodenv)
4+
* node.js v20.3.0 is installed with [nodenv](https://github.com/nodenv/nodenv)
55
* nodenv is installed in /opt/nodenv
66
* [yarn](https://yarnpkg.com/) is installed with deb package
77

nodejs/build/scripts/02-nodenv

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ node_version=$(/bin/bash /tmp/build/nodejs/helpers/latest-nodejs-version v20.)
1313
git clone https://github.com/nodenv/nodenv.git ${nodenv_root}
1414

1515
## install nodenv plugins
16-
git clone https://github.com/nodenv/node-build.git ${nodenv_root}/plugins/node-build
16+
#git clone https://github.com/nodenv/node-build.git ${nodenv_root}/plugins/node-build
17+
git clone -b latest-scraped-definitions \
18+
https://github.com/minimum2scp/node-build.git ${nodenv_root}/plugins/node-build
1719
git clone https://github.com/nodenv/nodenv-update.git ${nodenv_root}/plugins/nodenv-update
1820
git clone https://github.com/nodenv/nodenv-aliases.git ${nodenv_root}/plugins/nodenv-aliases
1921

rails7/build/scripts/02-nodenv

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ node_version=$(python3 /tmp/build/rails7/helpers/latest-nodejs-version.py v20.)
1313
git clone https://github.com/nodenv/nodenv.git ${nodenv_root}
1414

1515
## install nodenv plugins
16-
git clone https://github.com/nodenv/node-build.git ${nodenv_root}/plugins/node-build
16+
#git clone https://github.com/nodenv/node-build.git ${nodenv_root}/plugins/node-build
17+
git clone -b latest-scraped-definitions \
18+
https://github.com/minimum2scp/node-build.git ${nodenv_root}/plugins/node-build
1719
git clone https://github.com/nodenv/nodenv-update.git ${nodenv_root}/plugins/nodenv-update
1820
git clone https://github.com/nodenv/nodenv-aliases.git ${nodenv_root}/plugins/nodenv-aliases
1921

spec/nodejs/00base_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363

6464
describe command('nodenv version-name') do
6565
let(:login_shell){ true }
66-
its(:stdout){ should eq "20.2.0\n" }
66+
its(:stdout){ should eq "20.3.0\n" }
6767
end
6868

6969
[
7070
{
71-
nodejs: '20.2.0',
71+
nodejs: '20.3.0',
7272
},
7373
].each do |v|
7474
describe command('nodenv versions --bare --skip-aliases') do
@@ -86,15 +86,15 @@
8686
let(:login_shell){ true }
8787
its(:stdout){
8888
should eq <<~ALIASES
89-
20 => 20.2.0
90-
20.2 => 20.2.0
89+
20 => 20.3.0
90+
20.3 => 20.3.0
9191
ALIASES
9292
}
9393
end
9494

9595
{
96-
'20' => '20.2.0',
97-
'20.2' => '20.2.0',
96+
'20' => '20.3.0',
97+
'20.3' => '20.3.0',
9898
}.each do |src, dest|
9999
describe file("/opt/nodenv/versions/#{src}") do
100100
it { should be_symlink }

spec/rails7/00base_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@
7878

7979
describe command('nodenv version-name') do
8080
let(:login_shell){ true }
81-
its(:stdout){ should eq "20.2.0\n" }
81+
its(:stdout){ should eq "20.3.0\n" }
8282
end
8383

8484
[
8585
{
86-
nodejs: '20.2.0',
86+
nodejs: '20.3.0',
8787
},
8888
].each do |v|
8989
describe command('nodenv versions --bare --skip-aliases') do
@@ -102,15 +102,15 @@
102102
let(:login_shell){ true }
103103
its(:stdout){
104104
should eq <<~ALIASES
105-
20 => 20.2.0
106-
20.2 => 20.2.0
105+
20 => 20.3.0
106+
20.3 => 20.3.0
107107
ALIASES
108108
}
109109
end
110110

111111
{
112-
'20' => '20.2.0',
113-
'20.2' => '20.2.0',
112+
'20' => '20.3.0',
113+
'20.3' => '20.3.0',
114114
}.each do |src, dest|
115115
describe file("/opt/nodenv/versions/#{src}") do
116116
it { should be_symlink }

0 commit comments

Comments
 (0)