diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-10-20 13:00:38 -0400 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-10-20 13:00:38 -0400 |
| commit | f02ab9818a6904369f7828fce4e48a75211833aa (patch) | |
| tree | db21de2a73898a7b0c76fcdaa1ea23910051063b | |
| parent | 9a4848683859a80a7fbf15dc36d0a4e8374729c8 (diff) | |
Clean up ubuntu-x64 build steps
Installs the nodejs package via NodeSource, since the Bionic npm
package is heckin' broken.
| -rw-r--r-- | deployment/ubuntu-package-x64/Dockerfile | 8 | ||||
| -rwxr-xr-x | deployment/ubuntu-package-x64/docker-build.sh | 14 |
2 files changed, 4 insertions, 18 deletions
diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile index 1749d2ad0..99022891b 100644 --- a/deployment/ubuntu-package-x64/Dockerfile +++ b/deployment/ubuntu-package-x64/Dockerfile @@ -14,11 +14,11 @@ RUN apt-get update \ && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \ && mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian -# Install yarn package manager -RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ +# Install npm package manager +RUN wget -q -O- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ + && echo "deb https://deb.nodesource.com/node_8.x $(lsb_release -s -c) main" > /etc/apt/sources.list.d/npm.list \ && apt update \ - && apt install -y yarn + && apt install -y nodejs VOLUME ${ARTIFACT_DIR}/ diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh index 97bc45a06..9781879f6 100755 --- a/deployment/ubuntu-package-x64/docker-build.sh +++ b/deployment/ubuntu-package-x64/docker-build.sh @@ -11,20 +11,6 @@ pushd ${SOURCE_DIR} # Remove build-dep for dotnet-sdk-2.2, since it's not a package in this image sed -i '/dotnet-sdk-2.2,/d' debian/control -# Clone down and build Web frontend -web_build_dir="$( mktemp -d )" -web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" -git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ -pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi -yarn install -mkdir -p ${web_target} -mv dist/* ${web_target}/ -popd -rm -rf ${web_build_dir} - # Build DEB dpkg-buildpackage -us -uc |