Update to node 20

fix some issues with dockerfiles

combine installation statements into a single layer
This commit is contained in:
Arimil 2023-09-27 23:50:53 -04:00
parent b1847a5fcc
commit 05181616ae
11 changed files with 29 additions and 23 deletions

View file

@ -7,7 +7,7 @@ RELEASE := $(shell set -x; sed -ne '/^Release:/s/.* *\(.*\)%{.*}.*/\1/p' $(DIR)
SRPM := jellyfin-web-$(subst -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm
TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz
epel-7-x86_64_repos := https://rpm.nodesource.com/pub_16.x/el/\$$releasever/\$$basearch/
epel-7-x86_64_repos := https://rpm.nodesource.com/pub_20.x/nodistro/\$$basearch/
fed_ver := $(shell rpm -E %fedora)
# fallback when not running on Fedora

View file

@ -14,10 +14,10 @@ BuildArch: noarch
BuildRequires: nodejs
%else
BuildRequires: git
# Nodejs 16 is required and npm >= 8 should bring in NodeJS 16
# This requires the build environment to use the nodejs:16 module stream:
# dnf module {install|switch-to}:web nodejs:16
BuildRequires: npm >= 8
# Nodejs 20 is required and npm >= 10 should bring in NodeJS 20
# This requires the build environment to use the nodejs:20 module stream:
# dnf module {install|switch-to}:web nodejs:20
BuildRequires: npm >= 10
%endif
%description