diff options
| author | Thomas Büttner <thomas@vergesslicher.tech> | 2019-10-29 23:16:08 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2019-10-29 18:16:08 -0400 |
| commit | e6e9cd8ce22d9483c03029ab47adea5cd78b35f2 (patch) | |
| tree | a22667db84ae83b5c4477e2afbd562ae60b03b0e | |
| parent | 53ee78170ad3d5d5d0ecac2dbe8dcbfb13940e46 (diff) | |
Remove the SPEC edit hack, replace with proper repos (#7)
* Remove the SPEC edit hack, replace with proper repos
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
* Fix bad rpmbuild flag
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
| -rw-r--r-- | deployment/centos-package-x64/Dockerfile | 9 | ||||
| -rwxr-xr-x | deployment/centos-package-x64/docker-build.sh | 12 |
2 files changed, 6 insertions, 15 deletions
diff --git a/deployment/centos-package-x64/Dockerfile b/deployment/centos-package-x64/Dockerfile index 855b0a479..3e2d67435 100644 --- a/deployment/centos-package-x64/Dockerfile +++ b/deployment/centos-package-x64/Dockerfile @@ -13,13 +13,12 @@ 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 wget git +RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel 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 +RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \ + && rpm -i https://rpm.nodesource.com/pub_8.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \ + && yum install -y yarn # Install DotNET SDK RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \ diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh index b4e5df8f0..62dd144e5 100755 --- a/deployment/centos-package-x64/docker-build.sh +++ b/deployment/centos-package-x64/docker-build.sh @@ -8,17 +8,9 @@ set -o xtrace # Move to source directory pushd ${SOURCE_DIR} -# Prepare the source -source "$HOME/.nvm/nvm.sh" -nvm use v8 +# Build RPM make -f .copr/Makefile srpm outdir=/root/rpmbuild/SRPMS - -# Remove dep for nodejs/yarn since our build env won't have these (NVM instead) -sed -i '/BuildRequires: nodejs >= 8 yarn/d' SPECS/jellyfin.spec - -# Build the RPMs -rpmbuild -bs SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/" -rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/" +rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm # Move the artifacts out mkdir -p ${ARTIFACT_DIR}/rpm |