open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add bad web build branch hotfix

Browse Source 
I hate this quick and dirty hack but it makes no sense to port to
master. This fixes a bug whereby we'd build with the master Web branch
on releases due to never checking out the right branch. This is already
obsoleted in the master branch since #1925 already replaces this entire
process for Debuntu builds, and others should be fixed with a more
robust solution. That said, for the 10.4.z release chain, this
ultra-quick solution fixes the problem without changing much.
pull/2095/head
Joshua Boniface 5 years ago
parent 7f5a070406
commit b3fc995977
26 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File

1
deployment/debian-package-arm64/Dockerfile.amd64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

1
deployment/debian-package-arm64/Dockerfile.arm64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=arm64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/debian-package-arm64/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/debian-package-armhf/Dockerfile.amd64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

1
deployment/debian-package-armhf/Dockerfile.armhf
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=armhf
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/debian-package-armhf/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/debian-package-x64/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/debian-package-x64/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/linux-x64/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/linux-x64/docker-build.sh
Unescape View File

@ -14,7 +14,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/macos/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/macos/docker-build.sh
Unescape View File

@ -14,7 +14,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/portable/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/portable/docker-build.sh
Unescape View File

@ -14,7 +14,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/ubuntu-package-arm64/Dockerfile.amd64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

1
deployment/ubuntu-package-arm64/Dockerfile.arm64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=arm64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/ubuntu-package-arm64/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/ubuntu-package-armhf/Dockerfile.amd64
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

1
deployment/ubuntu-package-armhf/Dockerfile.armhf
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=armhf
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/ubuntu-package-armhf/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/ubuntu-package-x64/Dockerfile
Unescape View File

@ -7,6 +7,7 @@ ARG ARTIFACT_DIR=/dist
ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV web_branch=release-10.4.z
# Prepare Ubuntu build environment
RUN apt-get update \

2
deployment/ubuntu-package-x64/docker-build.sh
Unescape View File

@ -17,7 +17,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/win-x64/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/win-x64/docker-build.sh
Unescape View File

@ -20,7 +20,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

1
deployment/win-x86/Dockerfile
Unescape View File

@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs
ENV ARCH=amd64
ENV web_branch=release-10.4.z
# Prepare Debian build environment
RUN apt-get update \

2
deployment/win-x86/docker-build.sh
Unescape View File

@ -20,7 +20,7 @@ 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}
git checkout origin/${web_branch}
fi
yarn install
mkdir -p ${web_target}

Write Preview
Loading…
Cancel
Save