From 2f1d0be54377f3f12e5498234dc69e837a184eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= <ferferga@hotmail.com>
Date: Thu, 8 Apr 2021 23:09:52 +0200
Subject: [PATCH] chore(npm): fix CI after switch

---
 debian/rules                   | 2 +-
 deployment/Dockerfile.centos   | 7 +++----
 deployment/Dockerfile.debian   | 4 +++-
 deployment/Dockerfile.docker   | 2 +-
 deployment/Dockerfile.portable | 4 +++-
 deployment/build.portable      | 2 +-
 fedora/jellyfin-web.spec       | 3 ++-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1a8c5bce7..d9ba35ed3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_test:
 override_dh_clistrip:
 
 override_dh_auto_build:
-	npm ci --no-audit
+	npm ci --no-audit --unsafe-perm
 	mv $(CURDIR)/dist $(CURDIR)/web
 
 override_dh_auto_clean:
diff --git a/deployment/Dockerfile.centos b/deployment/Dockerfile.centos
index 12509c5d5..2bf490db7 100644
--- a/deployment/Dockerfile.centos
+++ b/deployment/Dockerfile.centos
@@ -12,10 +12,9 @@ ENV IS_DOCKER=YES
 # Prepare CentOS environment
 RUN yum update -y \
   && yum install -y epel-release \
-  && yum install -y @buildsys-build rpmdevtools git yum-plugins-core autoconf automake glibc-devel
-
-# Install recent NodeJS
-RUN rpm -i https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
+  && yum install -y @buildsys-build rpmdevtools git yum-plugins-core autoconf automake glibc-devel gcc-c++ make \
+  && curl -fsSL https://rpm.nodesource.com/setup_12.x | bash - \
+  && yum install -y nodejs
 
 # Link to build script
 RUN ln -sf ${SOURCE_DIR}/deployment/build.centos /build.sh
diff --git a/deployment/Dockerfile.debian b/deployment/Dockerfile.debian
index 0e13ec38e..29a36ec0d 100644
--- a/deployment/Dockerfile.debian
+++ b/deployment/Dockerfile.debian
@@ -12,7 +12,9 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
-  && apt-get install -y debhelper mmv npm git
+  && apt-get install -y debhelper mmv git curl \
+  && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \
+  && apt-get install -y nodejs
 
 
 # Link to build script
diff --git a/deployment/Dockerfile.docker b/deployment/Dockerfile.docker
index 398757f46..b812a7688 100644
--- a/deployment/Dockerfile.docker
+++ b/deployment/Dockerfile.docker
@@ -8,4 +8,4 @@ RUN apk add autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool ma
 WORKDIR ${SOURCE_DIR}
 COPY . .
 
-RUN npm ci --no-audit && mv dist ${ARTIFACT_DIR}
+RUN npm ci --no-audit --unsafe-perm && mv dist ${ARTIFACT_DIR}
diff --git a/deployment/Dockerfile.portable b/deployment/Dockerfile.portable
index b94e501de..eeed2e078 100644
--- a/deployment/Dockerfile.portable
+++ b/deployment/Dockerfile.portable
@@ -11,7 +11,9 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
-  && apt-get install -y mmv npm git
+  && apt-get install -y mmv curl git \
+  && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \
+  && apt-get install -y nodejs
 
 # Link to build script
 RUN ln -sf ${SOURCE_DIR}/deployment/build.portable /build.sh
diff --git a/deployment/build.portable b/deployment/build.portable
index 147043d7b..18f7a8d1e 100755
--- a/deployment/build.portable
+++ b/deployment/build.portable
@@ -14,7 +14,7 @@ else
 fi
 
 # build archives
-npm ci --no-audit
+npm ci --no-audit --unsafe-perm
 mv dist jellyfin-web_${version}
 tar -czf jellyfin-web_${version}_portable.tar.gz jellyfin-web_${version}
 rm -rf dist
diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec
index 409d5106c..b97b88d5b 100644
--- a/fedora/jellyfin-web.spec
+++ b/fedora/jellyfin-web.spec
@@ -27,7 +27,8 @@ Jellyfin is a free software media system that puts you in control of managing an
 %build
 
 %install
-npm ci --no-audit
+chown root:root -R .
+npm ci --no-audit --unsafe-perm
 %{__mkdir} -p %{buildroot}%{_datadir}
 mv dist %{buildroot}%{_datadir}/jellyfin-web
 %{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE