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

@ -16,7 +16,7 @@ jobs:
- task: NodeTool@0 - task: NodeTool@0
displayName: 'Install Node' displayName: 'Install Node'
inputs: inputs:
versionSpec: '16.x' versionSpec: '20.x'
- task: Cache@2 - task: Cache@2
displayName: 'Cache node_modules' displayName: 'Cache node_modules'

View file

@ -18,7 +18,7 @@ jobs:
- name: Setup node environment - name: Setup node environment
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 16 node-version: 20
check-latest: true check-latest: true
cache: npm cache: npm
@ -42,7 +42,7 @@ jobs:
- name: Setup node environment - name: Setup node environment
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 16 node-version: 20
check-latest: true check-latest: true
cache: npm cache: npm
@ -63,7 +63,7 @@ jobs:
- name: Setup node environment - name: Setup node environment
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 16 node-version: 20
check-latest: true check-latest: true
cache: npm cache: npm
@ -87,7 +87,7 @@ jobs:
- name: Setup node environment - name: Setup node environment
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 16 node-version: 20
check-latest: true check-latest: true
cache: npm cache: npm

View file

@ -18,7 +18,7 @@ jobs:
- name: Setup node environment - name: Setup node environment
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 16 node-version: 20
check-latest: true check-latest: true
cache: npm cache: npm

View file

@ -13,8 +13,8 @@ ENV IS_DOCKER=YES
RUN yum update -y \ RUN yum update -y \
&& yum install -y epel-release \ && yum install -y epel-release \
&& yum install -y rpmdevtools git autoconf automake glibc-devel gcc-c++ make \ && yum install -y rpmdevtools git autoconf automake glibc-devel gcc-c++ make \
&& curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - \ && yum install https://rpm.nodesource.com/pub_20.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y \
&& yum install -y nodejs && yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1
# Link to build script # Link to build script
RUN ln -sf ${SOURCE_DIR}/deployment/build.centos /build.sh RUN ln -sf ${SOURCE_DIR}/deployment/build.centos /build.sh

View file

@ -12,11 +12,13 @@ ENV IS_DOCKER=YES
# Prepare Debian build environment # Prepare Debian build environment
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y debhelper mmv git curl \ && apt-get install -y debhelper mmv git curl gnupg ca-certificates \
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
&& apt-get install -y nodejs && apt-get install -y nodejs
# Link to build script # Link to build script
RUN ln -sf ${SOURCE_DIR}/deployment/build.debian /build.sh RUN ln -sf ${SOURCE_DIR}/deployment/build.debian /build.sh

View file

@ -11,7 +11,8 @@ ENV IS_DOCKER=YES
# Prepare Fedora environment # Prepare Fedora environment
RUN dnf update -y \ RUN dnf update -y \
&& dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs autoconf automake glibc-devel make && yum install https://rpm.nodesource.com/pub_20.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y \
&& dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs autoconf automake glibc-devel make --setopt=nodesource-nodejs.module_hotfixes=1
# Link to build script # Link to build script
RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora /build.sh RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora /build.sh

View file

@ -11,8 +11,11 @@ ENV IS_DOCKER=YES
# Prepare Debian build environment # Prepare Debian build environment
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y mmv curl git \ && apt-get install -y mmv curl git gnupg ca-certificates \
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
&& apt-get install -y nodejs && apt-get install -y nodejs
# Link to build script # Link to build script

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 SRPM := jellyfin-web-$(subst -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm
TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz 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) fed_ver := $(shell rpm -E %fedora)
# fallback when not running on Fedora # fallback when not running on Fedora

View file

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

4
package-lock.json generated
View file

@ -125,8 +125,8 @@
"worker-loader": "3.0.8" "worker-loader": "3.0.8"
}, },
"engines": { "engines": {
"node": ">=16.13.1", "node": ">=20.7.0",
"npm": ">=8.1.2", "npm": ">=10.1.0",
"yarn": "YARN NO LONGER USED - use npm instead." "yarn": "YARN NO LONGER USED - use npm instead."
} }
}, },

View file

@ -150,8 +150,8 @@
"stylelint:scss": "stylelint --config=\".stylelintrc.scss.json\" \"src/**/*.scss\"" "stylelint:scss": "stylelint --config=\".stylelintrc.scss.json\" \"src/**/*.scss\""
}, },
"engines": { "engines": {
"node": ">=16.13.1", "node": ">=20.7.0",
"npm": ">=8.1.2", "npm": ">=10.1.0",
"yarn": "YARN NO LONGER USED - use npm instead." "yarn": "YARN NO LONGER USED - use npm instead."
} }
} }