Merge pull request #467 from manala/lazy.symfony/node-versions

[Lazy - Symfony] Add missing Node versions
manala · Nov 18, 2024 · e721719 · e721719
2 parents 5013584 + 7057a2a
commit e721719
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lazy.symfony/.manala.yaml b/lazy.symfony/.manala.yaml
@@ -78,7 +78,7 @@ system:
         extensions: []
     nodejs:
         # @option {"label": "Nodejs version"}
-        # @schema {"enum": [null, 16, 14, 12]}
+        # @schema {"enum": [null, 22, 20, 18, 16, 14, 12]}
         version: ~
     mariadb:
         # @option {"label": "MariaDB version"}

diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl
@@ -189,12 +189,21 @@ Signed-By: /etc/apt/keyrings/sury_php.gpg\n\
 {{ if $nodejs.version -}}
 # Nodejs
 RUN \
+{{- if semverCompare "<=20" ($nodejs.version | toString) }}
     curl -sSLf https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
         --output /etc/apt/keyrings/nodesource.asc \
+{{- else }}
+    curl -sSLf https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
+        --output /etc/apt/keyrings/nodesource.asc \
+{{- end }}
     && printf "\
 Types: deb\n\
 URIs: https://deb.nodesource.com/node_{{ $nodejs.version }}.x\n\
+{{- if semverCompare "<=20" ($nodejs.version | toString) }}
 Suites: {{ include "os_release" "VERSION_CODENAME" }}\n\
+{{- else }}
+Suites: nodistro\n\
+{{- end }}
 Components: main\n\
 Signed-By: /etc/apt/keyrings/nodesource.asc\n\
 " > /etc/apt/sources.list.d/nodesource.sources \

diff --git a/lazy.symfony/test/.manala.yaml b/lazy.symfony/test/.manala.yaml
@@ -30,7 +30,7 @@ system:
         extensions:
             - bcmath
     nodejs:
-        version: 16
+        version: 22
     mariadb:
         version: 10.5
     phpmyadmin: