diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-10-07 23:02:07 -0400 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-10-07 23:34:02 -0400 |
| commit | f20555bf4a07d117b33d7e8c721be2cf6031e719 (patch) | |
| tree | 1402f0c2b0cc5b342ab8c4ad129e904e9f30438d /deployment | |
| parent | d8c3b26fa686e440912a45d82bb9866b4b66822c (diff) | |
Use NVM to install nodejs v8 and yarn
Prevents failure of the installation of jellyfin-web dependencies due
to the NodeJS version in EPEL being too old. v8 might be a little
conservative but is the earliest compatible version. Instead of using
their repo to install Yarn, use the new nvm binary to install Yarn, thus
forcing it to use the updated NodeJS version.
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/centos-package-x64/Dockerfile | 12 | ||||
| -rwxr-xr-x | deployment/centos-package-x64/docker-build.sh | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/deployment/centos-package-x64/Dockerfile b/deployment/centos-package-x64/Dockerfile index 99f538bc29..855b0a4797 100644 --- a/deployment/centos-package-x64/Dockerfile +++ b/deployment/centos-package-x64/Dockerfile @@ -13,17 +13,19 @@ RUN yum update -y \ && yum install -y epel-release # Install build dependencies -RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel nodejs wget git +RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel wget git + +# Install recent NodeJS and Yarn +RUN wget -O- https://raw.githubusercontent.com/creationix/nvm/v0.35.0/install.sh | /bin/bash \ + && source "$HOME/.nvm/nvm.sh" \ + && nvm install v8 \ + && npm install -g yarn # Install DotNET SDK RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \ && rpmdev-setuptree \ && yum install -y dotnet-sdk-${SDK_VERSION} -# Install yarn package manager -RUN wget -q -O /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \ - && yum install -y yarn - # Create symlinks and directories RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \ && mkdir -p ${SOURCE_DIR}/SPECS \ diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh index 014f582f08..18e10661c3 100755 --- a/deployment/centos-package-x64/docker-build.sh +++ b/deployment/centos-package-x64/docker-build.sh @@ -18,6 +18,8 @@ pushd ${web_build_dir} if [[ -n ${web_branch} ]]; then checkout -b origin/${web_branch} fi +source "$HOME/.nvm/nvm.sh" +nvm use v8 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/ |