Skip to content

Commit 5947320

Browse files
authored
Merge pull request #1321 from minimum2scp/features/nodejs-26.1.0
nodejs, rails7: nodejs 26.2.0
2 parents 1e7ab53 + 6fc6f2c commit 5947320

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

nodejs/README.md

Lines changed: 2 additions & 2 deletions
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 v24.15.0 is installed with [nodenv](https://github.com/nodenv/nodenv)
4+
* node.js v26.2.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

@@ -56,7 +56,7 @@ If you need root privilege, use `sudo bash -lc "..."`.
5656
For example, install LTS version of nodejs:
5757

5858
```
59-
sudo bash -lc "nodenv install 22.22.2"
59+
sudo bash -lc "nodenv install 24.16.0"
6060
```
6161

6262

nodejs/build/scripts/02-nodenv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export DEBIAN_FRONTEND=noninteractive
66

77
nodenv_root=/opt/nodenv
88

9-
## get latest nodejs version (24.x.x) from https://nodejs.org/download/release/index.json
10-
node_version=$(/bin/bash /tmp/build/nodejs/helpers/latest-nodejs-version v24.)
9+
## get latest nodejs version (26.x.x) from https://nodejs.org/download/release/index.json
10+
node_version=$(/bin/bash /tmp/build/nodejs/helpers/latest-nodejs-version v26.)
1111

1212
## install nodenv into /opt/nodenv
1313
git clone https://github.com/nodenv/nodenv.git ${nodenv_root}

rails7/build/scripts/02-nodenv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export DEBIAN_FRONTEND=noninteractive
66

77
nodenv_root=/opt/nodenv
88

9-
## get latest nodejs version (24.x.x) from https://nodejs.org/download/release/index.json
10-
node_version=$(/bin/bash /tmp/build/rails7/helpers/latest-nodejs-version v24.)
9+
## get latest nodejs version (26.x.x) from https://nodejs.org/download/release/index.json
10+
node_version=$(/bin/bash /tmp/build/rails7/helpers/latest-nodejs-version v26.)
1111

1212
## install nodenv into /opt/nodenv
1313
git clone https://github.com/nodenv/nodenv.git ${nodenv_root}

spec/nodejs/00base_spec.rb

Lines changed: 6 additions & 6 deletions
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 "24.15.0\n" }
66+
its(:stdout){ should eq "26.2.0\n" }
6767
end
6868

6969
[
7070
{
71-
nodejs: '24.15.0',
71+
nodejs: '26.2.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-
24 => 24.15.0
90-
24.15 => 24.15.0
89+
26 => 26.2.0
90+
26.2 => 26.2.0
9191
ALIASES
9292
}
9393
end
9494

9595
{
96-
'24' => '24.15.0',
97-
'24.15' => '24.15.0',
96+
'26' => '26.2.0',
97+
'26.2' => '26.2.0',
9898
}.each do |src, dest|
9999
describe file("/opt/nodenv/versions/#{src}") do
100100
it { should be_symlink }

spec/rails7/00base_spec.rb

Lines changed: 6 additions & 6 deletions
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 "24.15.0\n" }
81+
its(:stdout){ should eq "26.2.0\n" }
8282
end
8383

8484
[
8585
{
86-
nodejs: '24.15.0',
86+
nodejs: '26.2.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-
24 => 24.15.0
106-
24.15 => 24.15.0
105+
26 => 26.2.0
106+
26.2 => 26.2.0
107107
ALIASES
108108
}
109109
end
110110

111111
{
112-
'24' => '24.15.0',
113-
'24.15' => '24.15.0',
112+
'26' => '26.2.0',
113+
'26.2' => '26.2.0',
114114
}.each do |src, dest|
115115
describe file("/opt/nodenv/versions/#{src}") do
116116
it { should be_symlink }

0 commit comments

Comments
 (0)