Skip to content

Commit c555d99

Browse files
committed
chore(docker): bump NodeJS versions in Edk2 containers
Signed-off-by: AtomicFS <vojtech.vesely@9elements.com>
1 parent 6bf9765 commit c555d99

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

docker/compose.yaml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ services:
8282
- PYTHON_VERSION=python2
8383
- GCC_CROSS_COMPILER_PACKAGES_ARM=gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-i686-linux-gnu
8484
- GCC_CROSS_COMPILER_PACKAGES_X86=gcc-i686-linux-gnu
85-
- NODESOURCE=https://deb.nodesource.com/setup_16.x
85+
- NODESOURCE=https://deb.nodesource.com/setup_18.x
86+
# NodeJS v20 requires libc6 version >= 2.28, but that is not possible with this old Ubuntu Bionic
87+
# Switching to newer Ubuntu is not a option either because of how fragile and snowflaky edk2 is
88+
# Updating libc6 is just a terrible idea, that means that udk2017 cannot run NodeJS v20
89+
# This is the best we can do
8690
# NonOSI wasn't used in 2017
8791
edk2-stable202008:
8892
build:
@@ -96,7 +100,7 @@ services:
96100
- GCC_VERSION=9
97101
- PYTHON_PACKAGES=python-is-python3 python2 python3
98102
- PYTHON_VERSION=python3
99-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
103+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
100104
edk2-stable202105:
101105
build:
102106
context: edk2
@@ -109,7 +113,7 @@ services:
109113
- GCC_VERSION=9
110114
- PYTHON_PACKAGES=python-is-python3 python2 python3
111115
- PYTHON_VERSION=python3
112-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
116+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
113117
edk2-stable202111:
114118
build:
115119
context: edk2
@@ -122,7 +126,7 @@ services:
122126
- GCC_VERSION=9
123127
- PYTHON_PACKAGES=python-is-python3 python2 python3
124128
- PYTHON_VERSION=python3
125-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
129+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
126130
# Building UniversalPayload from this point on is likely ???
127131
edk2-stable202205:
128132
build:
@@ -137,7 +141,7 @@ services:
137141
- GCC_VERSION=9
138142
- PYTHON_PACKAGES=python-is-python3 python2 python3
139143
- PYTHON_VERSION=python3
140-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
144+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
141145
edk2-stable202208:
142146
build:
143147
context: edk2
@@ -151,7 +155,7 @@ services:
151155
- GCC_VERSION=9
152156
- PYTHON_PACKAGES=python-is-python3 python2 python3
153157
- PYTHON_VERSION=python3
154-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
158+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
155159
edk2-stable202211:
156160
build:
157161
context: edk2
@@ -165,7 +169,7 @@ services:
165169
- GCC_VERSION=9
166170
- PYTHON_PACKAGES=python-is-python3 python2 python3
167171
- PYTHON_VERSION=python3
168-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
172+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
169173
edk2-stable202302:
170174
build:
171175
context: edk2
@@ -179,7 +183,7 @@ services:
179183
- GCC_VERSION=9
180184
- PYTHON_PACKAGES=python-is-python3 python2 python3
181185
- PYTHON_VERSION=python3
182-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
186+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
183187
edk2-stable202305:
184188
build:
185189
context: edk2
@@ -193,7 +197,7 @@ services:
193197
- GCC_VERSION=9
194198
- PYTHON_PACKAGES=python-is-python3 python2 python3
195199
- PYTHON_VERSION=python3
196-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
200+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
197201
# Since edk2-stable202305 the GCC_VERSION should be more flexible
198202
# https://github.com/tianocore/edk2/commit/0fc07b1c6a491fa1e81daed6cfc2ec33c8cac973
199203
edk2-stable202308:
@@ -209,7 +213,7 @@ services:
209213
- GCC_VERSION=12
210214
- PYTHON_PACKAGES=python-is-python3 python2 python3
211215
- PYTHON_VERSION=python3
212-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
216+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
213217
edk2-stable202311:
214218
build:
215219
context: edk2
@@ -223,7 +227,7 @@ services:
223227
- GCC_VERSION=12
224228
- PYTHON_PACKAGES=python-is-python3 python2 python3
225229
- PYTHON_VERSION=python3
226-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
230+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
227231
edk2-stable202402:
228232
build:
229233
context: edk2
@@ -237,7 +241,7 @@ services:
237241
- GCC_VERSION=12
238242
- PYTHON_PACKAGES=python-is-python3 python2 python3
239243
- PYTHON_VERSION=python3
240-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
244+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
241245
edk2-stable202405:
242246
build:
243247
context: edk2
@@ -251,7 +255,7 @@ services:
251255
- GCC_VERSION=12
252256
- PYTHON_PACKAGES=python-is-python3 python2 python3
253257
- PYTHON_VERSION=python3
254-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
258+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
255259
edk2-stable202408.01:
256260
build:
257261
context: edk2
@@ -265,7 +269,7 @@ services:
265269
- GCC_VERSION=13
266270
- PYTHON_PACKAGES=python-is-python3 python3
267271
- PYTHON_VERSION=python3
268-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
272+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
269273
edk2-stable202411:
270274
build:
271275
context: edk2
@@ -279,7 +283,7 @@ services:
279283
- GCC_VERSION=13
280284
- PYTHON_PACKAGES=python-is-python3 python3
281285
- PYTHON_VERSION=python3
282-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
286+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
283287
edk2-stable202502:
284288
build:
285289
context: edk2
@@ -293,7 +297,7 @@ services:
293297
- GCC_VERSION=13
294298
- PYTHON_PACKAGES=python-is-python3 python3
295299
- PYTHON_VERSION=python3
296-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
300+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
297301
edk2-stable202505:
298302
build:
299303
context: edk2
@@ -307,7 +311,7 @@ services:
307311
- GCC_VERSION=13
308312
- PYTHON_PACKAGES=python-is-python3 python3
309313
- PYTHON_VERSION=python3
310-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
314+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
311315
edk2-stable202508:
312316
build:
313317
context: edk2
@@ -321,7 +325,7 @@ services:
321325
- GCC_VERSION=13
322326
- PYTHON_PACKAGES=python-is-python3 python3
323327
- PYTHON_VERSION=python3
324-
- NODESOURCE=https://deb.nodesource.com/setup_20.x
328+
- NODESOURCE=https://deb.nodesource.com/setup_24.x
325329
#==================
326330
# linux
327331
#==================

docker/edk2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG SOURCE_IMAGE=buildpack-deps:focal
55
ARG INTERMEDIATE_IMAGE=base
66
ARG TARGETARCH=amd64
7-
ARG NODESOURCE=https://deb.nodesource.com/setup_20.x
7+
ARG NODESOURCE=https://deb.nodesource.com/setup_24.x
88

99
#=============
1010
# "base" stage with all needed build dependencies

0 commit comments

Comments
 (0)