From b5531a8187b4504d9f55221280c7388c9a73f0a8 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 21:46:17 -0400 Subject: [PATCH 01/27] Add Debian configuration --- debian/changelog | 5 +++ debian/compat | 1 + debian/control | 16 ++++++++++ debian/copyright | 28 +++++++++++++++++ debian/files | 2 ++ debian/gbp.conf | 6 ++++ debian/install | 1 + debian/jellyfin-web.substvars | 2 ++ debian/po/POTFILES.in | 1 + debian/po/templates.pot | 57 +++++++++++++++++++++++++++++++++++ debian/rules | 24 +++++++++++++++ debian/source/format | 1 + debian/source/options | 7 +++++ 13 files changed, 151 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/files create mode 100644 debian/gbp.conf create mode 100644 debian/install create mode 100644 debian/jellyfin-web.substvars create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/templates.pot create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..50966c3a0 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +jellyfin-web (10.6.0-1) unstable; urgency=medium + + * New upstream version 10.6.0; release changelog at https://github.com/jellyfin/jellyfin-web/releases/tag/v10.6.0 + + -- Jellyfin Packaging Team Mon, 16 Mar 2020 11:15:00 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..45a4fb75d --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..c900f9e2f --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: jellyfin-web +Section: misc +Priority: optional +Maintainer: Jellyfin Team +Build-Depends: debhelper (>= 9), + npm | nodejs +Standards-Version: 3.9.4 +Homepage: https://jellyfin.media/ +Vcs-Git: https://github.org/jellyfin/jellyfin.git +Vcs-Browser: https://github.org/jellyfin/jellyfin + +Package: jellyfin-web +Recommends: jellyfin-server +Architecture: any +Description: Jellyfin is the Free Software Media System. + This package provides the Jellyfin web client. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..85548075e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: jellyfin-web +Source: https://github.com/jellyfin/jellyfin-web + +Files: * +Copyright: 2018-2020 Jellyfin Team +License: GPL-3.0 + +Files: debian/* +Copyright: 2020 Joshua Boniface +License: GPL-3.0 + +License: GPL-3.0 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/files b/debian/files new file mode 100644 index 000000000..26315bf65 --- /dev/null +++ b/debian/files @@ -0,0 +1,2 @@ +jellyfin-web_10.6.0-1_amd64.buildinfo misc optional +jellyfin-web_10.6.0-1_amd64.deb misc optional diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000000000..60b3d2872 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +pristine-tar = False +cleaner = fakeroot debian/rules clean + +[import-orig] +filter = [ ".git*", ".hg*", ".vs*", ".vscode*" ] diff --git a/debian/install b/debian/install new file mode 100644 index 000000000..584fe06a1 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +web usr/share/jellyfin/ diff --git a/debian/jellyfin-web.substvars b/debian/jellyfin-web.substvars new file mode 100644 index 000000000..978fc8b5a --- /dev/null +++ b/debian/jellyfin-web.substvars @@ -0,0 +1,2 @@ +misc:Depends= +misc:Pre-Depends= diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 000000000..cef83a340 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 000000000..2cdcae417 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: jellyfin-server\n" +"Report-Msgid-Bugs-To: jellyfin-server@packages.debian.org\n" +"POT-Creation-Date: 2015-06-12 20:51-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "Jellyfin permission info:" +msgstr "" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "" +"Jellyfin by default runs under a user named \"jellyfin\". Please ensure that the " +"user jellyfin has read and write access to any folders you wish to add to your " +"library. Otherwise please run jellyfin under a different user." +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Username to run Jellyfin as:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "The user that jellyfin will run as." +msgstr "" + +#. Type: note +#. Description +#: ../templates:3001 +msgid "Jellyfin still running" +msgstr "" + +#. Type: note +#. Description +#: ../templates:3001 +msgid "Jellyfin is currently running. Please close it and try again." +msgstr "" diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..d15067278 --- /dev/null +++ b/debian/rules @@ -0,0 +1,24 @@ +#! /usr/bin/make -f +export DH_VERBOSE=1 + +%: + dh $@ + +# disable "make check" +override_dh_auto_test: + +# disable stripping debugging symbols +override_dh_clistrip: + +override_dh_auto_build: + npm install yarn + npx yarn install + npx yarn build + mv $(CURDIR)/dist $(CURDIR)/web + +override_dh_auto_clean: + test -d $(CURDIR)/dist && rm -rf '$(CURDIR)/dist' || true + test -d $(CURDIR)/web && rm -rf '$(CURDIR)/web' || true + test -d $(CURDIR)/node_modules && rm -rf '$(CURDIR)/node_modules' || true + git checkout package.json + git checkout yarn.lock diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..d3827e75a --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 000000000..b7adf56c6 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,7 @@ +tar-ignore='.git*' +tar-ignore='**/.git' +tar-ignore='**/.hg' +tar-ignore='**/.vs' +tar-ignore='**/.vscode' +tar-ignore='deployment' +tar-ignore='*.deb' From 7b6517182bb537ce4f32de0a9d94d8d6cfb2e677 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 21:46:31 -0400 Subject: [PATCH 02/27] Ignore transient build artifacts --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 10b2d24f4..aafa7ae75 100644 --- a/.gitignore +++ b/.gitignore @@ -576,3 +576,5 @@ healthchecksdb # dist for webpack output dist +web +node_modules From f798e5186069b6a667c0e03216c27c3156f6dd73 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 22:02:51 -0400 Subject: [PATCH 03/27] Don't install yarn during build, assume its there --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index d15067278..224d23c79 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,7 @@ override_dh_auto_test: override_dh_clistrip: override_dh_auto_build: - npm install yarn npx yarn install - npx yarn build mv $(CURDIR)/dist $(CURDIR)/web override_dh_auto_clean: From 42721c34ead4a7a3647b43c49bf56fe801d9a7b7 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 22:13:09 -0400 Subject: [PATCH 04/27] Use correct architecture --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c900f9e2f..912591e08 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,6 @@ Vcs-Browser: https://github.org/jellyfin/jellyfin Package: jellyfin-web Recommends: jellyfin-server -Architecture: any +Architecture: all Description: Jellyfin is the Free Software Media System. This package provides the Jellyfin web client. From 59f58bb7ce056412d7c4b89ebc4548488a6873e9 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 23:31:18 -0400 Subject: [PATCH 05/27] Bump version to 10.6.0 --- src/components/apphost.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/apphost.js b/src/components/apphost.js index f3e89ed29..5d033ce6f 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -348,7 +348,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet var deviceId; var deviceName; var appName = "Jellyfin Web"; - var appVersion = "10.5.0"; + var appVersion = "10.6.0"; var visibilityChange; var visibilityState; From 5f0b0a8b9495268e0c694853edf952a37c504aff Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 23:34:29 -0400 Subject: [PATCH 06/27] Update and simplify Debian directory --- debian/control | 1 + debian/files | 2 -- debian/jellyfin-web.substvars | 2 -- debian/rules | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 debian/files delete mode 100644 debian/jellyfin-web.substvars diff --git a/debian/control b/debian/control index 912591e08..6818f4e59 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Jellyfin Team Build-Depends: debhelper (>= 9), npm | nodejs Standards-Version: 3.9.4 +Architecture: all Homepage: https://jellyfin.media/ Vcs-Git: https://github.org/jellyfin/jellyfin.git Vcs-Browser: https://github.org/jellyfin/jellyfin diff --git a/debian/files b/debian/files deleted file mode 100644 index 26315bf65..000000000 --- a/debian/files +++ /dev/null @@ -1,2 +0,0 @@ -jellyfin-web_10.6.0-1_amd64.buildinfo misc optional -jellyfin-web_10.6.0-1_amd64.deb misc optional diff --git a/debian/jellyfin-web.substvars b/debian/jellyfin-web.substvars deleted file mode 100644 index 978fc8b5a..000000000 --- a/debian/jellyfin-web.substvars +++ /dev/null @@ -1,2 +0,0 @@ -misc:Depends= -misc:Pre-Depends= diff --git a/debian/rules b/debian/rules index 224d23c79..f3e568225 100755 --- a/debian/rules +++ b/debian/rules @@ -18,5 +18,3 @@ override_dh_auto_clean: test -d $(CURDIR)/dist && rm -rf '$(CURDIR)/dist' || true test -d $(CURDIR)/web && rm -rf '$(CURDIR)/web' || true test -d $(CURDIR)/node_modules && rm -rf '$(CURDIR)/node_modules' || true - git checkout package.json - git checkout yarn.lock From 441910514b2edb7656c5f6f44e99be130defd6bd Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Mar 2020 23:34:50 -0400 Subject: [PATCH 07/27] Add build script and build.yaml configuration --- build | 1 + build.sh | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++ build.yaml | 8 ++++ 3 files changed, 123 insertions(+) create mode 120000 build create mode 100755 build.sh create mode 100644 build.yaml diff --git a/build b/build new file mode 120000 index 000000000..c07a74de4 --- /dev/null +++ b/build @@ -0,0 +1 @@ +build.sh \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 000000000..86c844793 --- /dev/null +++ b/build.sh @@ -0,0 +1,114 @@ +#!/usr/bin/env bash + +# build.sh - Build Jellyfin binary packages +# Part of the Jellyfin Project + +set -o errexit +set -o pipefail + +usage() { + echo -e "build.sh - Build Jellyfin binary packages" + echo -e "Usage:" + echo -e " $0 -t/--type -p/--platform [-k/--keep-artifacts] [-l/--list-platforms]" + echo -e "Notes:" + echo -e " * BUILD_TYPE can be one of: [native, docker] and must be specified" + echo -e " * native: Build using the build script in the host OS" + echo -e " * docker: Build using the build script in a standardized Docker container" + echo -e " * PLATFORM can be any platform shown by -l/--list-platforms and must be specified" + echo -e " * If -k/--keep-artifacts is specified, transient artifacts (e.g. Docker containers) will be" + echo -e " retained after the build is finished; the source directory will still be cleaned" + echo -e " * If -l/--list-platforms is specified, all other arguments are ignored; the script will print" + echo -e " the list of supported platforms and exit" +} + +list_platforms() { + declare -a platforms + platforms=( + $( find deployment -maxdepth 1 -mindepth 1 -name "build.*" | awk -F'.' '{ $1=""; printf $2; if ($3 != ""){ printf "." $3; }; if ($4 != ""){ printf "." $4; }; print ""; }' | sort ) + ) + echo -e "Valid platforms:" + echo + for platform in ${platforms[@]}; do + echo -e "* ${platform} : $( grep '^#=' deployment/build.${platform} | sed 's/^#= //' )" + done +} + +do_build_native() { + if [[ $( dpkg --print-architecture | head -1 ) != "${PLATFORM##*.}" ]]; then + echo "Cross-building is not supported for native builds, use 'docker' builds on amd64 for cross-building." + exit 1 + fi + export IS_DOCKER=NO + deployment/build.${PLATFORM} +} + +do_build_docker() { + if ! dpkg --print-architecture | grep -q 'amd64'; then + echo "Docker-based builds only support amd64-based cross-building; use a 'native' build instead." + exit 1 + fi + if [[ ! -f deployment/Dockerfile.${PLATFORM} ]]; then + echo "Missing Dockerfile for platform ${PLATFORM}" + exit 1 + fi + if [[ ${KEEP_ARTIFACTS} == YES ]]; then + docker_args="" + else + docker_args="--rm" + fi + + docker build . -t "jellyfin-builder.${PLATFORM}" -f deployment/Dockerfile.${PLATFORM} + mkdir -p ${ARTIFACT_DIR} + docker run $docker_args -v "${SOURCE_DIR}:/jellyfin" -v "${ARTIFACT_DIR}:/dist" "jellyfin-builder.${PLATFORM}" +} + +while [[ $# -gt 0 ]]; do + key="$1" + case $key in + -t|--type) + BUILD_TYPE="$2" + shift # past argument + shift # past value + ;; + -p|--platform) + PLATFORM="$2" + shift # past argument + shift # past value + ;; + -k|--keep-artifacts) + KEEP_ARTIFACTS=YES + shift # past argument + ;; + -l|--list-platforms) + list_platforms + exit 0 + ;; + -h|--help) + usage + exit 0 + ;; + *) # unknown option + echo "Unknown option $1" + usage + exit 1 + ;; + esac +done + +if [[ -z ${BUILD_TYPE} || -z ${PLATFORM} ]]; then + usage + exit 1 +fi + +export SOURCE_DIR="$( pwd )" +export ARTIFACT_DIR="${SOURCE_DIR}/../bin/${PLATFORM}" + +# Determine build type +case ${BUILD_TYPE} in + native) + do_build_native + ;; + docker) + do_build_docker + ;; +esac diff --git a/build.yaml b/build.yaml new file mode 100644 index 000000000..65be2c708 --- /dev/null +++ b/build.yaml @@ -0,0 +1,8 @@ +--- +# We just wrap `build` so this is really it +name: "jellyfin-web" +version: "10.6.0" +packages: + - debian.all + - fedora.all + - portable From a52d37bfa92b27ca444fe8fa73a29a453ec1b821 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 00:01:03 -0400 Subject: [PATCH 08/27] Add Fedora package specification --- fedora/Makefile | 21 +++++++++++++++++++++ fedora/jellyfin-web.spec | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 fedora/Makefile create mode 100644 fedora/jellyfin-web.spec diff --git a/fedora/Makefile b/fedora/Makefile new file mode 100644 index 000000000..1d3e39ac8 --- /dev/null +++ b/fedora/Makefile @@ -0,0 +1,21 @@ +VERSION := $(shell sed -ne '/^Version:/s/.* *//p' fedora/jellyfin-web.spec) + +srpm: + cd fedora/; \ + SOURCE_DIR=.. \ + WORKDIR="$${PWD}"; \ + tar \ + --transform "s,^\.,jellyfin-web-$(VERSION)," \ + --exclude='.git*' \ + --exclude='**/.git' \ + --exclude='**/.hg' \ + --exclude='deployment' \ + --exclude='*.deb' \ + --exclude='*.rpm' \ + --exclude='jellyfin-web-$(VERSION).tar.gz' \ + -czf "jellyfin-web-$(VERSION).tar.gz" \ + -C $${SOURCE_DIR} ./ + cd fedora/; \ + rpmbuild -bs jellyfin-web.spec \ + --define "_sourcedir $$PWD/" \ + --define "_srcrpmdir $(outdir)" diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec new file mode 100644 index 000000000..64e5f4799 --- /dev/null +++ b/fedora/jellyfin-web.spec @@ -0,0 +1,40 @@ +%global debug_package %{nil} + +Name: jellyfin-web +Version: 10.6.0 +Release: 1%{?dist} +Summary: The Free Software Media System web client +License: GPLv3 +URL: https://jellyfin.media +# Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%{version}.tar.gz` +Source0: jellyfin-web-%{version}.tar.gz + +Requires(pre): shadow-utils +BuildRequires: nodejs-yarn +BuildArch: noarch + +# Disable Automatic Dependency Processing +AutoReqProv: no + +%description +Jellyfin is a free software media system that puts you in control of managing and streaming your media. + + +%prep +%autosetup -n jellyfin-web-%{version} -b 0 + +%build + +%install +yarn install +%{__mkdir} -p %{buildroot}%{_datadir} +mv dist %{buildroot}%{_datadir}/jellyfin-web +%{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE + +%files +%attr(755,root,root) %{_datadir}/jellyfin-web +%{_datadir}/licenses/jellyfin/LICENSE + +%changelog +* Mon Mar 23 2020 Jellyfin Packaging Team +- Forthcoming stable release From bd3f711f513f438be8d4b47c5b4ed4d1de44e609 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 00:06:35 -0400 Subject: [PATCH 09/27] Add deployment configurations --- deployment/Dockerfile.centos.all | 28 ++++++++++++++++++++++++++++ deployment/Dockerfile.debian.all | 25 +++++++++++++++++++++++++ deployment/Dockerfile.fedora.all | 22 ++++++++++++++++++++++ deployment/Dockerfile.portable | 25 +++++++++++++++++++++++++ deployment/build.centos.all | 27 +++++++++++++++++++++++++++ deployment/build.debian.all | 25 +++++++++++++++++++++++++ deployment/build.fedora.all | 27 +++++++++++++++++++++++++++ deployment/build.portable | 28 ++++++++++++++++++++++++++++ 8 files changed, 207 insertions(+) create mode 100644 deployment/Dockerfile.centos.all create mode 100644 deployment/Dockerfile.debian.all create mode 100644 deployment/Dockerfile.fedora.all create mode 100644 deployment/Dockerfile.portable create mode 100755 deployment/build.centos.all create mode 100755 deployment/build.debian.all create mode 100755 deployment/build.fedora.all create mode 100755 deployment/build.portable diff --git a/deployment/Dockerfile.centos.all b/deployment/Dockerfile.centos.all new file mode 100644 index 000000000..58ebab8d1 --- /dev/null +++ b/deployment/Dockerfile.centos.all @@ -0,0 +1,28 @@ +FROM centos:7 +# Docker build arguments +ARG SOURCE_DIR=/jellyfin +ARG ARTIFACT_DIR=/dist +# Docker run environment +ENV SOURCE_DIR=/jellyfin +ENV ARTIFACT_DIR=/dist +ENV DEB_BUILD_OPTIONS=noddebs +ENV IS_DOCKER=YES + +# Prepare CentOS environment +RUN yum update -y \ + && yum install -y epel-release \ + && yum install -y @buildsys-build rpmdevtools git yum-plugins-core nodejs-yarn autoconf automake glibc-devel + +# Install recent NodeJS and Yarn +RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \ + && rpm -i https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \ + && yum install -y yarn + +# Link to build script +RUN ln -sf ${SOURCE_DIR}/deployment/build.centos.all /build.sh + +VOLUME ${SOURCE_DIR}/ + +VOLUME ${ARTIFACT_DIR}/ + +ENTRYPOINT ["/build.sh"] diff --git a/deployment/Dockerfile.debian.all b/deployment/Dockerfile.debian.all new file mode 100644 index 000000000..54281a5eb --- /dev/null +++ b/deployment/Dockerfile.debian.all @@ -0,0 +1,25 @@ +FROM debian:10 +# Docker build arguments +ARG SOURCE_DIR=/jellyfin +ARG ARTIFACT_DIR=/dist +# Docker run environment +ENV SOURCE_DIR=/jellyfin +ENV ARTIFACT_DIR=/dist +ENV DEB_BUILD_OPTIONS=noddebs +ENV IS_DOCKER=YES + +# Prepare Debian build environment +RUN apt-get update \ + && apt-get install -y debhelper mmv npm git + +# Prepare Yarn +RUN npm install -g yarn + +# Link to build script +RUN ln -sf ${SOURCE_DIR}/deployment/build.debian.all /build.sh + +VOLUME ${SOURCE_DIR}/ + +VOLUME ${ARTIFACT_DIR}/ + +ENTRYPOINT ["/build.sh"] diff --git a/deployment/Dockerfile.fedora.all b/deployment/Dockerfile.fedora.all new file mode 100644 index 000000000..7b1e587a6 --- /dev/null +++ b/deployment/Dockerfile.fedora.all @@ -0,0 +1,22 @@ +FROM fedora:31 +# Docker build arguments +ARG SOURCE_DIR=/jellyfin +ARG ARTIFACT_DIR=/dist +# Docker run environment +ENV SOURCE_DIR=/jellyfin +ENV ARTIFACT_DIR=/dist +ENV DEB_BUILD_OPTIONS=noddebs +ENV IS_DOCKER=YES + +# Prepare Fedora environment +RUN dnf update -y \ + && dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs-yarn autoconf automake glibc-devel + +# Link to build script +RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora.all /build.sh + +VOLUME ${SOURCE_DIR}/ + +VOLUME ${ARTIFACT_DIR}/ + +ENTRYPOINT ["/build.sh"] diff --git a/deployment/Dockerfile.portable b/deployment/Dockerfile.portable new file mode 100644 index 000000000..e0d1f4526 --- /dev/null +++ b/deployment/Dockerfile.portable @@ -0,0 +1,25 @@ +FROM debian:10 +# Docker build arguments +ARG SOURCE_DIR=/jellyfin +ARG ARTIFACT_DIR=/dist +# Docker run environment +ENV SOURCE_DIR=/jellyfin +ENV ARTIFACT_DIR=/dist +ENV DEB_BUILD_OPTIONS=noddebs +ENV IS_DOCKER=YES + +# Prepare Debian build environment +RUN apt-get update \ + && apt-get install -y mmv npm git + +# Prepare Yarn +RUN npm install -g yarn + +# Link to build script +RUN ln -sf ${SOURCE_DIR}/deployment/build.portable /build.sh + +VOLUME ${SOURCE_DIR}/ + +VOLUME ${ARTIFACT_DIR}/ + +ENTRYPOINT ["/build.sh"] diff --git a/deployment/build.centos.all b/deployment/build.centos.all new file mode 100755 index 000000000..f15bd1c6d --- /dev/null +++ b/deployment/build.centos.all @@ -0,0 +1,27 @@ +#!/bin/bash + +#= Fedora 29+ all .rpm + +set -o errexit +set -o xtrace + +# Move to source directory +pushd ${SOURCE_DIR} + +cp -a yarn.lock /tmp/yarn.lock + +# Build RPM +make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS +rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm + +# Move the artifacts out +mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/ + +if [[ ${IS_DOCKER} == YES ]]; then + chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} +fi + +rm -f fedora/jellyfin*.tar.gz +cp -a /tmp/yarn.lock yarn.lock + +popd diff --git a/deployment/build.debian.all b/deployment/build.debian.all new file mode 100755 index 000000000..5d1662cfb --- /dev/null +++ b/deployment/build.debian.all @@ -0,0 +1,25 @@ +#!/bin/bash + +#= Debian/Ubuntu all .deb + +set -o errexit +set -o xtrace + +# Move to source directory +pushd ${SOURCE_DIR} + +cp -a yarn.lock /tmp/yarn.lock + +# Build DEB +dpkg-buildpackage -us -uc --pre-clean --post-clean + +mkdir -p ${ARTIFACT_DIR}/ +mv ../jellyfin[-_]* ${ARTIFACT_DIR}/ + +cp -a /tmp/yarn.lock yarn.lock + +if [[ ${IS_DOCKER} == YES ]]; then + chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} +fi + +popd diff --git a/deployment/build.fedora.all b/deployment/build.fedora.all new file mode 100755 index 000000000..4ba12f35e --- /dev/null +++ b/deployment/build.fedora.all @@ -0,0 +1,27 @@ +#!/bin/bash + +#= Fedora 29+ all .rpm + +set -o errexit +set -o xtrace + +# Move to source directory +pushd ${SOURCE_DIR} + +cp -a yarn.lock /tmp/yarn.lock + +# Build RPM +make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS +rpmbuild -rb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm + +# Move the artifacts out +mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/ + +if [[ ${IS_DOCKER} == YES ]]; then + chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} +fi + +rm -f fedora/jellyfin*.tar.gz +cp -a /tmp/yarn.lock yarn.lock + +popd diff --git a/deployment/build.portable b/deployment/build.portable new file mode 100755 index 000000000..c4cbe927e --- /dev/null +++ b/deployment/build.portable @@ -0,0 +1,28 @@ +#!/bin/bash + +#= Portable .NET DLL .tar.gz + +set -o errexit +set -o xtrace + +# Move to source directory +pushd ${SOURCE_DIR} + +# Get version +version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" + +# Build archives +npx yarn install +mv dist/ jellyfin-web_${version} +tar -czf jellyfin-web_${version}_portable.tar.gz jellyfin-web_${version} +rm -rf dist/ + +# Move the artifacts out +mkdir -p ${ARTIFACT_DIR}/ +mv jellyfin[-_]*.tar.gz ${ARTIFACT_DIR}/ + +if [[ ${IS_DOCKER} == YES ]]; then + chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} +fi + +popd From 60b0bbd08280900dbcc4b46256b7b6f614e0bec0 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 00:19:04 -0400 Subject: [PATCH 10/27] Improve dependencies in CentOS --- fedora/jellyfin-web.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index 64e5f4799..84d96f650 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -9,8 +9,11 @@ URL: https://jellyfin.media # Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%{version}.tar.gz` Source0: jellyfin-web-%{version}.tar.gz -Requires(pre): shadow-utils -BuildRequires: nodejs-yarn +%if 0%{?centos} +BuildRequires: yarn +%else +BuildRequires nodejs-yarn +%endif BuildArch: noarch # Disable Automatic Dependency Processing From 75924b89756439d83e79f5fd000c11158c2bcc3b Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 01:12:45 -0400 Subject: [PATCH 11/27] Fix name of CentOS platform --- deployment/build.centos.all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/build.centos.all b/deployment/build.centos.all index f15bd1c6d..8c2cec6d3 100755 --- a/deployment/build.centos.all +++ b/deployment/build.centos.all @@ -1,6 +1,6 @@ #!/bin/bash -#= Fedora 29+ all .rpm +#= CentOS 7 all .rpm set -o errexit set -o xtrace From 285920372b054677e37cf5a4bc471e8251d800b1 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 01:13:10 -0400 Subject: [PATCH 12/27] Add CentOS to build.yaml --- build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.yaml b/build.yaml index 65be2c708..fe1633fae 100644 --- a/build.yaml +++ b/build.yaml @@ -5,4 +5,5 @@ version: "10.6.0" packages: - debian.all - fedora.all + - centos.all - portable From e6a3cb20d256c2a6d794cfa28dc02febe9789337 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 01:22:43 -0400 Subject: [PATCH 13/27] Add CODEOWNERS for GitHub --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..e902dc712 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,3 @@ +# Joshua must review all changes to deployment and build.sh +deployment/* @joshuaboniface +build.sh @joshuaboniface From 39685be74c249823af34177582ec4bf65f7348cb Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 01:45:32 -0400 Subject: [PATCH 14/27] Add COPR makefile link --- .copr/Makefile | 1 + 1 file changed, 1 insertion(+) create mode 120000 .copr/Makefile diff --git a/.copr/Makefile b/.copr/Makefile new file mode 120000 index 000000000..ec3c90dfd --- /dev/null +++ b/.copr/Makefile @@ -0,0 +1 @@ +../fedora/Makefile \ No newline at end of file From 873cc0df954ab1a9802185c0febe0805917a5e7e Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 11:11:08 -0400 Subject: [PATCH 15/27] Remove arch checking for native builds --- build.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.sh b/build.sh index 86c844793..5432cb86d 100755 --- a/build.sh +++ b/build.sh @@ -34,10 +34,6 @@ list_platforms() { } do_build_native() { - if [[ $( dpkg --print-architecture | head -1 ) != "${PLATFORM##*.}" ]]; then - echo "Cross-building is not supported for native builds, use 'docker' builds on amd64 for cross-building." - exit 1 - fi export IS_DOCKER=NO deployment/build.${PLATFORM} } From 9b9ec403cb92af26ea65f74fbd938594dcdbd627 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 11:11:55 -0400 Subject: [PATCH 16/27] Remove obsolete Architecture field in src package --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 6818f4e59..912591e08 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jellyfin Team Build-Depends: debhelper (>= 9), npm | nodejs Standards-Version: 3.9.4 -Architecture: all Homepage: https://jellyfin.media/ Vcs-Git: https://github.org/jellyfin/jellyfin.git Vcs-Browser: https://github.org/jellyfin/jellyfin From 2ec397756ea89a136f528f23a435557736415344 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 24 Mar 2020 11:14:55 -0400 Subject: [PATCH 17/27] Use more specific mv source glob --- deployment/build.debian.all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/build.debian.all b/deployment/build.debian.all index 5d1662cfb..8d617a288 100755 --- a/deployment/build.debian.all +++ b/deployment/build.debian.all @@ -14,7 +14,7 @@ cp -a yarn.lock /tmp/yarn.lock dpkg-buildpackage -us -uc --pre-clean --post-clean mkdir -p ${ARTIFACT_DIR}/ -mv ../jellyfin[-_]* ${ARTIFACT_DIR}/ +mv ../jellyfin*.{deb,dsc,tar.gz,buildinfo,changes} ${ARTIFACT_DIR}/ cp -a /tmp/yarn.lock yarn.lock From 5e00dd92051cce81352b06aad8fe9b5bb6a13d93 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 30 Mar 2020 15:31:14 -0400 Subject: [PATCH 18/27] Add bump_version script --- bump_version | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100755 bump_version diff --git a/bump_version b/bump_version new file mode 100755 index 000000000..451ae94c2 --- /dev/null +++ b/bump_version @@ -0,0 +1,98 @@ +#!/usr/bin/env bash + +# bump_version - increase the shared version and generate changelogs + +set -o errexit +set -o pipefail + +usage() { + echo -e "bump_version - increase the shared version and generate changelogs" + echo -e "" + echo -e "Usage:" + echo -e " $ bump_version " +} + +if [[ -z $1 ]]; then + usage + exit 1 +fi + +shared_version_file="src/components/apphost.js" +build_file="./build.yaml" + +new_version="$1" + +# Parse the version from the AssemblyVersion +old_version="$( + grep "appVersion" ${shared_version_file} | head -1 \ + | sed -E 's/var appVersion = "([0-9\.]+)";/\1/' +)" +echo $old_version + +# Set the shared version to the specified new_version +old_version_sed="$( sed 's/\./\\./g' <<<"${old_version}" )" # Escape the '.' chars +new_version_sed="$( cut -f1 -d'-' <<<"${new_version}" )" +sed -i "s/${old_version_sed}/${new_version_sed}/g" ${shared_version_file} + +old_version="$( + grep "version:" ${build_file} \ + | sed -E 's/version: "([0-9\.]+[-a-z0-9]*)"/\1/' +)" +echo $old_version + +# Set the build.yaml version to the specified new_version +old_version_sed="$( sed 's/\./\\./g' <<<"${old_version}" )" # Escape the '.' chars +sed -i "s/${old_version_sed}/${new_version}/g" ${build_file} + +if [[ ${new_version} == *"-"* ]]; then + new_version_deb="$( sed 's/-/~/g' <<<"${new_version}" )" +else + new_version_deb="${new_version}-1" +fi + +# Write out a temporary Debian changelog with our new stuff appended and some templated formatting +debian_changelog_file="debian/changelog" +debian_changelog_temp="$( mktemp )" +# Create new temp file with our changelog +echo -e "jellyfin (${new_version_deb}) unstable; urgency=medium + + * New upstream version ${new_version}; release changelog at https://github.com/jellyfin/jellyfin-web/releases/tag/v${new_version} + + -- Jellyfin Packaging Team $( date --rfc-2822 ) +" >> ${debian_changelog_temp} +cat ${debian_changelog_file} >> ${debian_changelog_temp} +# Move into place +mv ${debian_changelog_temp} ${debian_changelog_file} +# Clean up +rm -f ${debian_changelog_temp} + +# Write out a temporary Yum changelog with our new stuff prepended and some templated formatting +fedora_spec_file="fedora/jellyfin.spec" +fedora_changelog_temp="$( mktemp )" +fedora_spec_temp_dir="$( mktemp -d )" +fedora_spec_temp="${fedora_spec_temp_dir}/jellyfin.spec.tmp" +# Make a copy of our spec file for hacking +cp ${fedora_spec_file} ${fedora_spec_temp_dir}/ +pushd ${fedora_spec_temp_dir} +# Split out the stuff before and after changelog +csplit jellyfin.spec "/^%changelog/" # produces xx00 xx01 +# Update the version in xx00 +sed -i "s/${old_version_sed}/${new_version_sed}/g" xx00 +# Remove the header from xx01 +sed -i '/^%changelog/d' xx01 +# Create new temp file with our changelog +echo -e "%changelog +* $( LANG=C date '+%a %b %d %Y' ) Jellyfin Packaging Team +- New upstream version ${new_version}; release changelog at https://github.com/jellyfin/jellyfin-web/releases/tag/v${new_version}" >> ${fedora_changelog_temp} +cat xx01 >> ${fedora_changelog_temp} +# Reassembble +cat xx00 ${fedora_changelog_temp} > ${fedora_spec_temp} +popd +# Move into place +mv ${fedora_spec_temp} ${fedora_spec_file} +# Clean up +rm -rf ${fedora_changelog_temp} ${fedora_spec_temp_dir} + +# Stage the changed files for commit +git add ${shared_version_file} ${build_file} ${debian_changelog_file} ${fedora_spec_file} Dockerfile* +git status From 773a959f2bd1128dbe4ea50a1cd6014aa940cc46 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 9 Apr 2020 12:13:49 -0400 Subject: [PATCH 19/27] Remove build symlink --- build | 1 - 1 file changed, 1 deletion(-) delete mode 120000 build diff --git a/build b/build deleted file mode 120000 index c07a74de4..000000000 --- a/build +++ /dev/null @@ -1 +0,0 @@ -build.sh \ No newline at end of file From 3af18a1f830c17624fb2b7cf2e4809da2cbd86f5 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 9 Apr 2020 12:14:21 -0400 Subject: [PATCH 20/27] Remove copy-pasta comments --- build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 5432cb86d..9f5fa6022 100755 --- a/build.sh +++ b/build.sh @@ -63,17 +63,17 @@ while [[ $# -gt 0 ]]; do case $key in -t|--type) BUILD_TYPE="$2" - shift # past argument - shift # past value + shift + shift ;; -p|--platform) PLATFORM="$2" - shift # past argument - shift # past value + shift + shift ;; -k|--keep-artifacts) KEEP_ARTIFACTS=YES - shift # past argument + shift ;; -l|--list-platforms) list_platforms @@ -83,7 +83,7 @@ while [[ $# -gt 0 ]]; do usage exit 0 ;; - *) # unknown option + *) echo "Unknown option $1" usage exit 1 From c867677d701c279576c4d6272e41f50d55ab0731 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 19 Apr 2020 20:29:30 +0900 Subject: [PATCH 21/27] update links Co-Authored-By: Vasily --- debian/control | 6 +++--- fedora/jellyfin-web.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 912591e08..ce7b130ef 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Jellyfin Team Build-Depends: debhelper (>= 9), npm | nodejs Standards-Version: 3.9.4 -Homepage: https://jellyfin.media/ -Vcs-Git: https://github.org/jellyfin/jellyfin.git -Vcs-Browser: https://github.org/jellyfin/jellyfin +Homepage: https://jellyfin.org/ +Vcs-Git: https://github.org/jellyfin/jellyfin-web.git +Vcs-Browser: https://github.org/jellyfin/jellyfin-web Package: jellyfin-web Recommends: jellyfin-server diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index 84d96f650..dbc0bd0ef 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -5,7 +5,7 @@ Version: 10.6.0 Release: 1%{?dist} Summary: The Free Software Media System web client License: GPLv3 -URL: https://jellyfin.media +URL: https://jellyfin.org # Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%{version}.tar.gz` Source0: jellyfin-web-%{version}.tar.gz From 5ef81ab41e20aa4e06b748ab80c82cf65ece4de9 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 25 Apr 2020 22:14:45 -0400 Subject: [PATCH 22/27] Update bump_version Co-Authored-By: Vasily --- bump_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump_version b/bump_version index 451ae94c2..e422a9d99 100755 --- a/bump_version +++ b/bump_version @@ -22,7 +22,7 @@ build_file="./build.yaml" new_version="$1" -# Parse the version from the AssemblyVersion +# Parse the version from shared version file old_version="$( grep "appVersion" ${shared_version_file} | head -1 \ | sed -E 's/var appVersion = "([0-9\.]+)";/\1/' From fc8efaeab4096f43a55a8e186daf69ef389acb89 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 25 Apr 2020 22:14:55 -0400 Subject: [PATCH 23/27] Update bump_version Co-Authored-By: Vasily --- bump_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump_version b/bump_version index e422a9d99..e2bc6c7e9 100755 --- a/bump_version +++ b/bump_version @@ -38,7 +38,7 @@ old_version="$( grep "version:" ${build_file} \ | sed -E 's/version: "([0-9\.]+[-a-z0-9]*)"/\1/' )" -echo $old_version +echo "Old version in ${build_file}: $old_version`" # Set the build.yaml version to the specified new_version old_version_sed="$( sed 's/\./\\./g' <<<"${old_version}" )" # Escape the '.' chars From 847273a3c9f748055e61c1c2e11066494a2cfdf0 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 25 Apr 2020 22:15:15 -0400 Subject: [PATCH 24/27] Update bump_version Co-Authored-By: Vasily --- bump_version | 2 -- 1 file changed, 2 deletions(-) diff --git a/bump_version b/bump_version index e2bc6c7e9..18405acdc 100755 --- a/bump_version +++ b/bump_version @@ -63,8 +63,6 @@ echo -e "jellyfin (${new_version_deb}) unstable; urgency=medium cat ${debian_changelog_file} >> ${debian_changelog_temp} # Move into place mv ${debian_changelog_temp} ${debian_changelog_file} -# Clean up -rm -f ${debian_changelog_temp} # Write out a temporary Yum changelog with our new stuff prepended and some templated formatting fedora_spec_file="fedora/jellyfin.spec" From f6b2ea287c80ffe38f9603dde03b7a9a24f48324 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 25 Apr 2020 22:15:38 -0400 Subject: [PATCH 25/27] Update bump_version Co-Authored-By: Vasily --- bump_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump_version b/bump_version index 18405acdc..bc8288b82 100755 --- a/bump_version +++ b/bump_version @@ -27,7 +27,7 @@ old_version="$( grep "appVersion" ${shared_version_file} | head -1 \ | sed -E 's/var appVersion = "([0-9\.]+)";/\1/' )" -echo $old_version +echo "Old version in appHost is: $old_version" # Set the shared version to the specified new_version old_version_sed="$( sed 's/\./\\./g' <<<"${old_version}" )" # Escape the '.' chars From 443273c0303eea02c7a972729d43f47cf5090a09 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 29 Apr 2020 14:14:38 -0400 Subject: [PATCH 26/27] Update deployment/Dockerfile.centos.all MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Odd Stråbø --- deployment/Dockerfile.centos.all | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/Dockerfile.centos.all b/deployment/Dockerfile.centos.all index 58ebab8d1..93bf8d698 100644 --- a/deployment/Dockerfile.centos.all +++ b/deployment/Dockerfile.centos.all @@ -5,7 +5,6 @@ ARG ARTIFACT_DIR=/dist # Docker run environment ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist -ENV DEB_BUILD_OPTIONS=noddebs ENV IS_DOCKER=YES # Prepare CentOS environment From 7b47bb623515058d5a8f0a8efd7ac05f997cf93b Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 29 Apr 2020 14:14:49 -0400 Subject: [PATCH 27/27] Update deployment/Dockerfile.fedora.all MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Odd Stråbø --- deployment/Dockerfile.fedora.all | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/Dockerfile.fedora.all b/deployment/Dockerfile.fedora.all index 7b1e587a6..d47f4ff4d 100644 --- a/deployment/Dockerfile.fedora.all +++ b/deployment/Dockerfile.fedora.all @@ -5,7 +5,6 @@ ARG ARTIFACT_DIR=/dist # Docker run environment ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist -ENV DEB_BUILD_OPTIONS=noddebs ENV IS_DOCKER=YES # Prepare Fedora environment