소스 검색

Clean up ubuntu-x64 build steps

Installs the nodejs package via NodeSource, since the Bionic npm
package is heckin' broken.
Joshua Boniface 5 년 전
부모
커밋
f02ab9818a
2개의 변경된 파일4개의 추가작업 그리고 18개의 파일을 삭제
  1. 4 4
      deployment/ubuntu-package-x64/Dockerfile
  2. 0 14
      deployment/ubuntu-package-x64/docker-build.sh

+ 4 - 4
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}/
 

+ 0 - 14
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