diff --git a/deployment/debian-package-arm64/Dockerfile.amd64 b/deployment/debian-package-arm64/Dockerfile.amd64 index 5644c14704..eeb1f82dc2 100644 --- a/deployment/debian-package-arm64/Dockerfile.amd64 +++ b/deployment/debian-package-arm64/Dockerfile.amd64 @@ -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 \ diff --git a/deployment/debian-package-arm64/Dockerfile.arm64 b/deployment/debian-package-arm64/Dockerfile.arm64 index 4384367669..db04dde113 100644 --- a/deployment/debian-package-arm64/Dockerfile.arm64 +++ b/deployment/debian-package-arm64/Dockerfile.arm64 @@ -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 \ diff --git a/deployment/debian-package-arm64/docker-build.sh b/deployment/debian-package-arm64/docker-build.sh index 7a13bafcbb..6b32977539 100755 --- a/deployment/debian-package-arm64/docker-build.sh +++ b/deployment/debian-package-arm64/docker-build.sh @@ -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} diff --git a/deployment/debian-package-armhf/Dockerfile.amd64 b/deployment/debian-package-armhf/Dockerfile.amd64 index b05f10def2..8fe7435850 100644 --- a/deployment/debian-package-armhf/Dockerfile.amd64 +++ b/deployment/debian-package-armhf/Dockerfile.amd64 @@ -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 \ diff --git a/deployment/debian-package-armhf/Dockerfile.armhf b/deployment/debian-package-armhf/Dockerfile.armhf index 6729d8f389..0fa646b6e9 100644 --- a/deployment/debian-package-armhf/Dockerfile.armhf +++ b/deployment/debian-package-armhf/Dockerfile.armhf @@ -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 \ diff --git a/deployment/debian-package-armhf/docker-build.sh b/deployment/debian-package-armhf/docker-build.sh index c48ccb3fb8..7eb73a2809 100755 --- a/deployment/debian-package-armhf/docker-build.sh +++ b/deployment/debian-package-armhf/docker-build.sh @@ -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} diff --git a/deployment/debian-package-x64/Dockerfile b/deployment/debian-package-x64/Dockerfile index 2f97d39445..79dbc69079 100644 --- a/deployment/debian-package-x64/Dockerfile +++ b/deployment/debian-package-x64/Dockerfile @@ -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 \ diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh index 97bc45a060..ce70f28a86 100755 --- a/deployment/debian-package-x64/docker-build.sh +++ b/deployment/debian-package-x64/docker-build.sh @@ -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} diff --git a/deployment/linux-x64/Dockerfile b/deployment/linux-x64/Dockerfile index d634b55de9..44ded66ec8 100644 --- a/deployment/linux-x64/Dockerfile +++ b/deployment/linux-x64/Dockerfile @@ -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 \ diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh index 8860f943c9..bb899a82fe 100755 --- a/deployment/linux-x64/docker-build.sh +++ b/deployment/linux-x64/docker-build.sh @@ -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} diff --git a/deployment/macos/Dockerfile b/deployment/macos/Dockerfile index 406a2d853e..63f599fbec 100644 --- a/deployment/macos/Dockerfile +++ b/deployment/macos/Dockerfile @@ -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 \ diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh index 1b4a554e6d..af11214ee6 100755 --- a/deployment/macos/docker-build.sh +++ b/deployment/macos/docker-build.sh @@ -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} diff --git a/deployment/portable/Dockerfile b/deployment/portable/Dockerfile index bdbf978fe7..94cf34fbaf 100644 --- a/deployment/portable/Dockerfile +++ b/deployment/portable/Dockerfile @@ -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 \ diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh index 0cc6e84f06..1127a90a16 100755 --- a/deployment/portable/docker-build.sh +++ b/deployment/portable/docker-build.sh @@ -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} diff --git a/deployment/ubuntu-package-arm64/Dockerfile.amd64 b/deployment/ubuntu-package-arm64/Dockerfile.amd64 index 838e70d505..e435c9be43 100644 --- a/deployment/ubuntu-package-arm64/Dockerfile.amd64 +++ b/deployment/ubuntu-package-arm64/Dockerfile.amd64 @@ -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 \ diff --git a/deployment/ubuntu-package-arm64/Dockerfile.arm64 b/deployment/ubuntu-package-arm64/Dockerfile.arm64 index 789dcc15a1..fab8bd6e6a 100644 --- a/deployment/ubuntu-package-arm64/Dockerfile.arm64 +++ b/deployment/ubuntu-package-arm64/Dockerfile.arm64 @@ -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 \ diff --git a/deployment/ubuntu-package-arm64/docker-build.sh b/deployment/ubuntu-package-arm64/docker-build.sh index 7a13bafcbb..6b32977539 100755 --- a/deployment/ubuntu-package-arm64/docker-build.sh +++ b/deployment/ubuntu-package-arm64/docker-build.sh @@ -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} diff --git a/deployment/ubuntu-package-armhf/Dockerfile.amd64 b/deployment/ubuntu-package-armhf/Dockerfile.amd64 index d1123e0b61..0216eb4559 100644 --- a/deployment/ubuntu-package-armhf/Dockerfile.amd64 +++ b/deployment/ubuntu-package-armhf/Dockerfile.amd64 @@ -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 \ diff --git a/deployment/ubuntu-package-armhf/Dockerfile.armhf b/deployment/ubuntu-package-armhf/Dockerfile.armhf index c9e093e51e..45d6cb002c 100644 --- a/deployment/ubuntu-package-armhf/Dockerfile.armhf +++ b/deployment/ubuntu-package-armhf/Dockerfile.armhf @@ -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 \ diff --git a/deployment/ubuntu-package-armhf/docker-build.sh b/deployment/ubuntu-package-armhf/docker-build.sh index c48ccb3fb8..7eb73a2809 100755 --- a/deployment/ubuntu-package-armhf/docker-build.sh +++ b/deployment/ubuntu-package-armhf/docker-build.sh @@ -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} diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile index 1749d2ad04..a0e2802e65 100644 --- a/deployment/ubuntu-package-x64/Dockerfile +++ b/deployment/ubuntu-package-x64/Dockerfile @@ -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 \ diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh index 97bc45a060..ce70f28a86 100755 --- a/deployment/ubuntu-package-x64/docker-build.sh +++ b/deployment/ubuntu-package-x64/docker-build.sh @@ -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} diff --git a/deployment/win-x64/Dockerfile b/deployment/win-x64/Dockerfile index 7f64c7daed..221d44b0f5 100644 --- a/deployment/win-x64/Dockerfile +++ b/deployment/win-x64/Dockerfile @@ -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 \ diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh index 3f1ad78b50..9f9ccee935 100755 --- a/deployment/win-x64/docker-build.sh +++ b/deployment/win-x64/docker-build.sh @@ -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} diff --git a/deployment/win-x86/Dockerfile b/deployment/win-x86/Dockerfile index fb5f5d6b61..8510f8dd2c 100644 --- a/deployment/win-x86/Dockerfile +++ b/deployment/win-x86/Dockerfile @@ -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 \ diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh index 7d79ba4958..a41f53d0ee 100755 --- a/deployment/win-x86/docker-build.sh +++ b/deployment/win-x86/docker-build.sh @@ -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}