mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-08 23:00:51 +02:00
Merge pull request #824 from joshuaboniface/improved-docker-pkgbuild
Improved Docker pkgbuild
This commit is contained in:
commit
d6c669a7c8
24
build
24
build
|
@ -23,8 +23,9 @@ usage() {
|
||||||
echo -e "Usage:"
|
echo -e "Usage:"
|
||||||
echo -e " $ build --list-platforms"
|
echo -e " $ build --list-platforms"
|
||||||
echo -e " $ build --list-actions <platform>"
|
echo -e " $ build --list-actions <platform>"
|
||||||
echo -e " $ build [-b/--web-branch <web_branch>] <platform> <action>"
|
echo -e " $ build [-k/--keep-artifacts] [-b/--web-branch <web_branch>] <platform> <action>"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
|
echo -e "The 'keep-artifacts' option preserves build artifacts, e.g. Docker images for system package builds."
|
||||||
echo -e "The web_branch defaults to the same branch name as the current main branch."
|
echo -e "The web_branch defaults to the same branch name as the current main branch."
|
||||||
echo -e "To build all platforms, use 'all'."
|
echo -e "To build all platforms, use 'all'."
|
||||||
echo -e "To perform all build actions, use 'all'."
|
echo -e "To perform all build actions, use 'all'."
|
||||||
|
@ -67,6 +68,14 @@ if [[ $1 == '--list-actions' ]]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Parse keep-artifacts option
|
||||||
|
if [[ $1 == '-k' || $1 == '--keep-artifacts' ]]; then
|
||||||
|
keep_artifacts="y"
|
||||||
|
shift 1
|
||||||
|
else
|
||||||
|
keep_artifacts="n"
|
||||||
|
fi
|
||||||
|
|
||||||
# Parse branch option
|
# Parse branch option
|
||||||
if [[ $1 == '-b' || $1 == '--web-branch' ]]; then
|
if [[ $1 == '-b' || $1 == '--web-branch' ]]; then
|
||||||
web_branch="$2"
|
web_branch="$2"
|
||||||
|
@ -193,6 +202,13 @@ for target_platform in ${platform[@]}; do
|
||||||
echo -e "> Processing platform ${target_platform}"
|
echo -e "> Processing platform ${target_platform}"
|
||||||
date_start=$( date +%s )
|
date_start=$( date +%s )
|
||||||
pushd ${target_platform}
|
pushd ${target_platform}
|
||||||
|
cleanup() {
|
||||||
|
echo -e ">> Processing action clean"
|
||||||
|
if [[ -f clean.sh && -x clean.sh ]]; then
|
||||||
|
./clean.sh ${keep_artifacts}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup EXIT INT
|
||||||
for target_action in ${action[@]}; do
|
for target_action in ${action[@]}; do
|
||||||
echo -e ">> Processing action ${target_action}"
|
echo -e ">> Processing action ${target_action}"
|
||||||
if [[ -f ${target_action}.sh && -x ${target_action}.sh ]]; then
|
if [[ -f ${target_action}.sh && -x ${target_action}.sh ]]; then
|
||||||
|
@ -204,12 +220,8 @@ for target_platform in ${platform[@]}; do
|
||||||
target_dir="../../../jellyfin-build/${target_platform}"
|
target_dir="../../../jellyfin-build/${target_platform}"
|
||||||
mkdir -p ${target_dir}
|
mkdir -p ${target_dir}
|
||||||
mv pkg-dist/* ${target_dir}/
|
mv pkg-dist/* ${target_dir}/
|
||||||
|
|
||||||
echo -e ">> Processing action clean"
|
|
||||||
if [[ -f clean.sh && -x clean.sh ]]; then
|
|
||||||
./clean.sh
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
cleanup
|
||||||
date_end=$( date +%s )
|
date_end=$( date +%s )
|
||||||
echo -e "> Completed platform ${target_platform} in $( expr ${date_end} - ${date_start} ) seconds."
|
echo -e "> Completed platform ${target_platform} in $( expr ${date_end} - ${date_start} ) seconds."
|
||||||
popd
|
popd
|
||||||
|
|
|
@ -55,6 +55,8 @@ These builds are not necessarily run from the `build` script, but are present fo
|
||||||
|
|
||||||
* The `clean` action should always `exit 0` even if no work is done or it fails.
|
* The `clean` action should always `exit 0` even if no work is done or it fails.
|
||||||
|
|
||||||
|
* The `clean` action can be passed a variable as argument 1, named `keep_artifacts`, containing either the value `y` or `n`. It is indended to handle situations when the user runs `build --keep-artifacts` and should be handled intelligently. Usually, this is used to preserve Docker images while still removing temporary directories.
|
||||||
|
|
||||||
### Output Files
|
### Output Files
|
||||||
|
|
||||||
* Upon completion of the defined actions, at least one output file must be created in the `<platform>/pkg-dist` directory.
|
* Upon completion of the defined actions, at least one output file must be created in the `<platform>/pkg-dist` directory.
|
||||||
|
|
|
@ -1,15 +1,27 @@
|
||||||
FROM centos:7
|
FROM centos:7
|
||||||
ARG HOME=/build
|
# Docker build arguments
|
||||||
RUN mkdir /build && \
|
ARG SOURCE_DIR=/jellyfin
|
||||||
yum install -y @buildsys-build rpmdevtools yum-plugins-core && \
|
ARG PLATFORM_DIR=/jellyfin/deployment/centos-package-x64
|
||||||
rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm && \
|
ARG ARTIFACT_DIR=/dist
|
||||||
rpmdev-setuptree
|
ARG SDK_VERSION=2.2
|
||||||
|
# Docker run environment
|
||||||
|
ENV SOURCE_DIR=/jellyfin
|
||||||
|
ENV ARTIFACT_DIR=/dist
|
||||||
|
|
||||||
WORKDIR /build/rpmbuild
|
# Prepare CentOS build environment
|
||||||
COPY ./deployment/centos-package-x64/pkg-src/jellyfin.spec SPECS
|
RUN yum update -y \
|
||||||
COPY ./deployment/centos-package-x64/pkg-src/ SOURCES
|
&& yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel \
|
||||||
|
&& rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \
|
||||||
|
&& rpmdev-setuptree \
|
||||||
|
&& yum install -y dotnet-sdk-${SDK_VERSION} \
|
||||||
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SPECS \
|
||||||
|
&& ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SOURCES \
|
||||||
|
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
||||||
|
|
||||||
RUN spectool -g -R SPECS/jellyfin.spec && \
|
VOLUME ${ARTIFACT_DIR}/
|
||||||
rpmbuild -bs SPECS/jellyfin.spec && \
|
|
||||||
yum-builddep -y SRPMS/jellyfin-*.src.rpm && \
|
COPY . ${SOURCE_DIR}/
|
||||||
rpmbuild -bb SPECS/jellyfin.spec;
|
|
||||||
|
ENTRYPOINT ["/docker-build.sh"]
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
../fedora-package-x64/clean.sh
|
|
34
deployment/centos-package-x64/clean.sh
Executable file
34
deployment/centos-package-x64/clean.sh
Executable file
|
@ -0,0 +1,34 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source ../common.build.sh
|
||||||
|
|
||||||
|
keep_artifacts="${1}"
|
||||||
|
|
||||||
|
WORKDIR="$( pwd )"
|
||||||
|
VERSION="$( grep -A1 '^Version:' ${WORKDIR}/pkg-src/jellyfin.spec | awk '{ print $NF }' )"
|
||||||
|
|
||||||
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
package_source_dir="${WORKDIR}/pkg-src"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-centos-build"
|
||||||
|
|
||||||
|
rm -f "${package_source_dir}/jellyfin-${VERSION}.tar.gz" &>/dev/null \
|
||||||
|
|| sudo rm -f "${package_source_dir}/jellyfin-${VERSION}.tar.gz" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${package_temporary_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${package_temporary_dir}" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${output_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${output_dir}" &>/dev/null
|
||||||
|
|
||||||
|
if [[ ${keep_artifacts} == 'n' ]]; then
|
||||||
|
docker_sudo=""
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo=sudo
|
||||||
|
fi
|
||||||
|
${docker_sudo} docker image rm ${image_name} --force
|
||||||
|
fi
|
1
deployment/centos-package-x64/dependencies.txt
Normal file
1
deployment/centos-package-x64/dependencies.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
docker
|
20
deployment/centos-package-x64/docker-build.sh
Executable file
20
deployment/centos-package-x64/docker-build.sh
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Builds the RPM inside the Docker container
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Move to source directory
|
||||||
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
|
ls -al SOURCES/pkg-src/
|
||||||
|
|
||||||
|
# Build RPM
|
||||||
|
spectool -g -R SPECS/jellyfin.spec
|
||||||
|
rpmbuild -bs SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
|
||||||
|
rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
|
||||||
|
|
||||||
|
# Move the artifacts out
|
||||||
|
mkdir -p ${ARTIFACT_DIR}/rpm
|
||||||
|
mv /root/rpmbuild/RPMS/x86_64/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/rpm/
|
|
@ -1 +0,0 @@
|
||||||
../fedora-package-x64/package.sh
|
|
80
deployment/centos-package-x64/package.sh
Executable file
80
deployment/centos-package-x64/package.sh
Executable file
|
@ -0,0 +1,80 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source ../common.build.sh
|
||||||
|
|
||||||
|
WORKDIR="$( pwd )"
|
||||||
|
VERSION="$( grep '^Version:' ${WORKDIR}/pkg-src/jellyfin.spec | awk '{ print $NF }' )"
|
||||||
|
|
||||||
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
pkg_src_dir="${WORKDIR}/pkg-src"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-centos-build"
|
||||||
|
|
||||||
|
# Determine if sudo should be used for Docker
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo="sudo"
|
||||||
|
else
|
||||||
|
docker_sudo=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create RPM source archive
|
||||||
|
GNU_TAR=1
|
||||||
|
mkdir -p "${package_temporary_dir}"
|
||||||
|
echo "Bundling all sources for RPM build."
|
||||||
|
tar \
|
||||||
|
--transform "s,^\.,jellyfin-${VERSION}," \
|
||||||
|
--exclude='.git*' \
|
||||||
|
--exclude='**/.git' \
|
||||||
|
--exclude='**/.hg' \
|
||||||
|
--exclude='**/.vs' \
|
||||||
|
--exclude='**/.vscode' \
|
||||||
|
--exclude='deployment' \
|
||||||
|
--exclude='**/bin' \
|
||||||
|
--exclude='**/obj' \
|
||||||
|
--exclude='**/.nuget' \
|
||||||
|
--exclude='*.deb' \
|
||||||
|
--exclude='*.rpm' \
|
||||||
|
-czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" \
|
||||||
|
-C "../.." ./ || GNU_TAR=0
|
||||||
|
|
||||||
|
if [ $GNU_TAR -eq 0 ]; then
|
||||||
|
echo "The installed tar binary did not support --transform. Using workaround."
|
||||||
|
mkdir -p "${package_temporary_dir}/jellyfin"
|
||||||
|
# Not GNU tar
|
||||||
|
tar \
|
||||||
|
--exclude='.git*' \
|
||||||
|
--exclude='**/.git' \
|
||||||
|
--exclude='**/.hg' \
|
||||||
|
--exclude='**/.vs' \
|
||||||
|
--exclude='**/.vscode' \
|
||||||
|
--exclude='deployment' \
|
||||||
|
--exclude='**/bin' \
|
||||||
|
--exclude='**/obj' \
|
||||||
|
--exclude='**/.nuget' \
|
||||||
|
--exclude='*.deb' \
|
||||||
|
--exclude='*.rpm' \
|
||||||
|
-zcf \
|
||||||
|
"${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \
|
||||||
|
-C "../.." ./
|
||||||
|
echo "Extracting filtered package."
|
||||||
|
tar -xzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
|
||||||
|
echo "Removing filtered package."
|
||||||
|
rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz"
|
||||||
|
echo "Repackaging package into final tarball."
|
||||||
|
tar -czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set up the build environment Docker image
|
||||||
|
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
|
||||||
|
# Build the RPMs and copy out to ${package_temporary_dir}
|
||||||
|
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}"
|
||||||
|
# Correct ownership on the RPMs (as current user, then as root if that fails)
|
||||||
|
chown -R "${current_user}" "${package_temporary_dir}" \
|
||||||
|
|| sudo chown -R "${current_user}" "${package_temporary_dir}"
|
||||||
|
# Move the RPMs to the output directory
|
||||||
|
mkdir -p "${output_dir}"
|
||||||
|
mv "${package_temporary_dir}"/rpm/* "${output_dir}"
|
|
@ -1,23 +1,21 @@
|
||||||
FROM debian:9
|
FROM microsoft/dotnet:2.2-sdk-stretch
|
||||||
ARG SOURCEDIR=/repo
|
# Docker build arguments
|
||||||
|
ARG SOURCE_DIR=/jellyfin
|
||||||
|
ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-x64
|
||||||
|
ARG ARTIFACT_DIR=/dist
|
||||||
|
# Docker run environment
|
||||||
|
ENV SOURCE_DIR=/jellyfin
|
||||||
|
ENV ARTIFACT_DIR=/dist
|
||||||
ENV DEB_BUILD_OPTIONS=noddebs
|
ENV DEB_BUILD_OPTIONS=noddebs
|
||||||
|
|
||||||
# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
|
# Prepare Debian build environment
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts \
|
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev \
|
||||||
&& wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
&& mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
|
&& mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
|
||||||
&& wget -q https://packages.microsoft.com/config/debian/9/prod.list \
|
|
||||||
&& mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \
|
|
||||||
&& chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
|
|
||||||
&& chown root:root /etc/apt/sources.list.d/microsoft-prod.list \
|
|
||||||
&& apt-get update
|
|
||||||
|
|
||||||
WORKDIR ${SOURCEDIR}
|
VOLUME ${ARTIFACT_DIR}/
|
||||||
COPY . .
|
|
||||||
COPY ./deployment/debian-package-x64/pkg-src ./debian
|
|
||||||
|
|
||||||
RUN yes | mk-build-deps -i debian/control \
|
COPY . ${SOURCE_DIR}/
|
||||||
&& dpkg-buildpackage -us -uc
|
|
||||||
|
|
||||||
WORKDIR /
|
ENTRYPOINT ["/docker-build.sh"]
|
||||||
|
|
|
@ -2,6 +2,28 @@
|
||||||
|
|
||||||
source ../common.build.sh
|
source ../common.build.sh
|
||||||
|
|
||||||
VERSION=`get_version ../..`
|
keep_artifacts="${1}"
|
||||||
|
|
||||||
clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION}
|
WORKDIR="$( pwd )"
|
||||||
|
|
||||||
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-debian-build"
|
||||||
|
|
||||||
|
rm -rf "${package_temporary_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${package_temporary_dir}" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${output_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${output_dir}" &>/dev/null
|
||||||
|
|
||||||
|
if [[ ${keep_artifacts} == 'n' ]]; then
|
||||||
|
docker_sudo=""
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo=sudo
|
||||||
|
fi
|
||||||
|
${docker_sudo} docker image rm ${image_name} --force
|
||||||
|
fi
|
||||||
|
|
19
deployment/debian-package-x64/docker-build.sh
Executable file
19
deployment/debian-package-x64/docker-build.sh
Executable file
|
@ -0,0 +1,19 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Builds the DEB inside the Docker container
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Move to source directory
|
||||||
|
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
|
||||||
|
|
||||||
|
# Build DEB
|
||||||
|
dpkg-buildpackage -us -uc
|
||||||
|
|
||||||
|
# Move the artifacts out
|
||||||
|
mkdir -p ${ARTIFACT_DIR}/deb
|
||||||
|
mv /jellyfin_* ${ARTIFACT_DIR}/deb/
|
|
@ -2,30 +2,30 @@
|
||||||
|
|
||||||
source ../common.build.sh
|
source ../common.build.sh
|
||||||
|
|
||||||
VERSION=`get_version ../..`
|
WORKDIR="$( pwd )"
|
||||||
|
|
||||||
# TODO get the version in the package automatically. And using the changelog to decide the debian package suffix version.
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-debian-build"
|
||||||
|
|
||||||
# Build a Jellyfin .deb file with Docker on Linux
|
# Determine if sudo should be used for Docker
|
||||||
# Places the output .deb file in the parent directory
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo="sudo"
|
||||||
|
else
|
||||||
|
docker_sudo=""
|
||||||
|
fi
|
||||||
|
|
||||||
package_temporary_dir="`pwd`/pkg-dist-tmp"
|
# Set up the build environment Docker image
|
||||||
output_dir="`pwd`/pkg-dist"
|
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
|
||||||
current_user="`whoami`"
|
# Build the DEBs and copy out to ${package_temporary_dir}
|
||||||
image_name="jellyfin-debuild"
|
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}"
|
||||||
|
# Correct ownership on the DEBs (as current user, then as root if that fails)
|
||||||
cleanup() {
|
chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null \
|
||||||
set +o errexit
|
|| sudo chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null
|
||||||
docker image rm $image_name --force
|
# Move the DEBs to the output directory
|
||||||
rm -rf "$package_temporary_dir"
|
mkdir -p "${output_dir}"
|
||||||
}
|
mv "${package_temporary_dir}"/deb/* "${output_dir}"
|
||||||
trap cleanup EXIT INT
|
|
||||||
|
|
||||||
docker build ../.. -t "$image_name" -f ./Dockerfile --build-arg SOURCEDIR="/jellyfin-${VERSION}"
|
|
||||||
mkdir -p "$package_temporary_dir"
|
|
||||||
mkdir -p "$output_dir"
|
|
||||||
docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find / -maxdepth 1 -type f -name "jellyfin*" -exec mv {} /temp \;'
|
|
||||||
chown -R "$current_user" "$package_temporary_dir" \
|
|
||||||
|| sudo chown -R "$current_user" "$package_temporary_dir"
|
|
||||||
|
|
||||||
mv "$package_temporary_dir"/* "$output_dir"
|
|
||||||
|
|
|
@ -1,15 +1,27 @@
|
||||||
FROM fedora:29
|
FROM fedora:29
|
||||||
ARG HOME=/build
|
# Docker build arguments
|
||||||
RUN mkdir /build && \
|
ARG SOURCE_DIR=/jellyfin
|
||||||
dnf install -y @buildsys-build rpmdevtools dnf-plugins-core && \
|
ARG PLATFORM_DIR=/jellyfin/deployment/fedora-package-x64
|
||||||
dnf copr enable -y @dotnet-sig/dotnet && \
|
ARG ARTIFACT_DIR=/dist
|
||||||
rpmdev-setuptree
|
ARG SDK_VERSION=2.2
|
||||||
|
# Docker run environment
|
||||||
|
ENV SOURCE_DIR=/jellyfin
|
||||||
|
ENV ARTIFACT_DIR=/dist
|
||||||
|
|
||||||
WORKDIR /build/rpmbuild
|
# Prepare Fedora build environment
|
||||||
COPY ./deployment/fedora-package-x64/pkg-src/jellyfin.spec SPECS
|
RUN dnf update -y \
|
||||||
COPY ./deployment/fedora-package-x64/pkg-src/ SOURCES
|
&& dnf install -y @buildsys-build rpmdevtools dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel \
|
||||||
|
&& dnf copr enable -y @dotnet-sig/dotnet \
|
||||||
|
&& rpmdev-setuptree \
|
||||||
|
&& dnf install -y dotnet-sdk-${SDK_VERSION} \
|
||||||
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SPECS \
|
||||||
|
&& ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SOURCES \
|
||||||
|
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
||||||
|
|
||||||
RUN spectool -g -R SPECS/jellyfin.spec && \
|
VOLUME ${ARTIFACT_DIR}/
|
||||||
rpmbuild -bs SPECS/jellyfin.spec && \
|
|
||||||
dnf build-dep -y SRPMS/jellyfin-*.src.rpm && \
|
COPY . ${SOURCE_DIR}/
|
||||||
rpmbuild -bb SPECS/jellyfin.spec;
|
|
||||||
|
ENTRYPOINT ["/docker-build.sh"]
|
||||||
|
|
|
@ -2,17 +2,33 @@
|
||||||
|
|
||||||
source ../common.build.sh
|
source ../common.build.sh
|
||||||
|
|
||||||
VERSION=`get_version ../..`
|
keep_artifacts="${1}"
|
||||||
|
|
||||||
package_temporary_dir="`pwd`/pkg-dist-tmp"
|
WORKDIR="$( pwd )"
|
||||||
pkg_src_dir="`pwd`/pkg-src"
|
VERSION="$( grep -A1 '^Version:' ${WORKDIR}/pkg-src/jellyfin.spec | awk '{ print $NF }' )"
|
||||||
image_name="jellyfin-rpmbuild"
|
|
||||||
docker_sudo=""
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \
|
package_source_dir="${WORKDIR}/pkg-src"
|
||||||
[ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
docker_sudo=sudo
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-fedora-build"
|
||||||
|
|
||||||
|
rm -f "${package_source_dir}/jellyfin-${VERSION}.tar.gz" &>/dev/null \
|
||||||
|
|| sudo rm -f "${package_source_dir}/jellyfin-${VERSION}.tar.gz" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${package_temporary_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${package_temporary_dir}" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${output_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${output_dir}" &>/dev/null
|
||||||
|
|
||||||
|
if [[ ${keep_artifacts} == 'n' ]]; then
|
||||||
|
docker_sudo=""
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo=sudo
|
||||||
|
fi
|
||||||
|
${docker_sudo} docker image rm ${image_name} --force
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$docker_sudo docker image rm $image_name --force
|
|
||||||
rm -rf "$package_temporary_dir"
|
|
||||||
rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"
|
|
||||||
|
|
20
deployment/fedora-package-x64/docker-build.sh
Executable file
20
deployment/fedora-package-x64/docker-build.sh
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Builds the RPM inside the Docker container
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Move to source directory
|
||||||
|
pushd ${SOURCE_DIR}
|
||||||
|
|
||||||
|
ls -al SOURCES/pkg-src/
|
||||||
|
|
||||||
|
# Build RPM
|
||||||
|
spectool -g -R SPECS/jellyfin.spec
|
||||||
|
rpmbuild -bs SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
|
||||||
|
rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
|
||||||
|
|
||||||
|
# Move the artifacts out
|
||||||
|
mkdir -p ${ARTIFACT_DIR}/rpm
|
||||||
|
mv /root/rpmbuild/RPMS/x86_64/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/rpm/
|
|
@ -1,38 +1,29 @@
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
source ../common.build.sh
|
source ../common.build.sh
|
||||||
|
|
||||||
VERSION=`get_version ../..`
|
WORKDIR="$( pwd )"
|
||||||
|
VERSION="$( grep '^Version:' ${WORKDIR}/pkg-src/jellyfin.spec | awk '{ print $NF }' )"
|
||||||
|
|
||||||
# TODO get the version in the package automatically. And using the changelog to decide the debian package suffix version.
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
pkg_src_dir="${WORKDIR}/pkg-src"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-fedora-build"
|
||||||
|
|
||||||
# Build a Jellyfin .rpm file with Docker on Linux
|
# Determine if sudo should be used for Docker
|
||||||
# Places the output .rpm file in the parent directory
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
set -o errexit
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
set -o xtrace
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
set -o nounset
|
docker_sudo="sudo"
|
||||||
|
else
|
||||||
package_temporary_dir="`pwd`/pkg-dist-tmp"
|
docker_sudo=""
|
||||||
output_dir="`pwd`/pkg-dist"
|
|
||||||
pkg_src_dir="`pwd`/pkg-src"
|
|
||||||
current_user="`whoami`"
|
|
||||||
image_name="jellyfin-rpmbuild"
|
|
||||||
docker_sudo=""
|
|
||||||
if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \
|
|
||||||
[ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then
|
|
||||||
docker_sudo=sudo
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cleanup() {
|
# Create RPM source archive
|
||||||
set +o errexit
|
|
||||||
$docker_sudo docker image rm $image_name --force
|
|
||||||
rm -rf "$package_temporary_dir"
|
|
||||||
rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"
|
|
||||||
}
|
|
||||||
trap cleanup EXIT INT
|
|
||||||
GNU_TAR=1
|
GNU_TAR=1
|
||||||
mkdir -p "$package_temporary_dir"
|
mkdir -p "${package_temporary_dir}"
|
||||||
echo "Bundling all sources for RPM build."
|
echo "Bundling all sources for RPM build."
|
||||||
tar \
|
tar \
|
||||||
--transform "s,^\.,jellyfin-${VERSION}," \
|
--transform "s,^\.,jellyfin-${VERSION}," \
|
||||||
|
@ -47,12 +38,12 @@ tar \
|
||||||
--exclude='**/.nuget' \
|
--exclude='**/.nuget' \
|
||||||
--exclude='*.deb' \
|
--exclude='*.deb' \
|
||||||
--exclude='*.rpm' \
|
--exclude='*.rpm' \
|
||||||
-zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
|
-czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" \
|
||||||
-C "../.." ./ || GNU_TAR=0
|
-C "../.." ./ || GNU_TAR=0
|
||||||
|
|
||||||
if [ $GNU_TAR -eq 0 ]; then
|
if [ $GNU_TAR -eq 0 ]; then
|
||||||
echo "The installed tar binary did not support --transform. Using workaround."
|
echo "The installed tar binary did not support --transform. Using workaround."
|
||||||
mkdir -p "$package_temporary_dir/jellyfin-${VERSION}"
|
mkdir -p "${package_temporary_dir}/jellyfin"
|
||||||
# Not GNU tar
|
# Not GNU tar
|
||||||
tar \
|
tar \
|
||||||
--exclude='.git*' \
|
--exclude='.git*' \
|
||||||
|
@ -67,20 +58,23 @@ if [ $GNU_TAR -eq 0 ]; then
|
||||||
--exclude='*.deb' \
|
--exclude='*.deb' \
|
||||||
--exclude='*.rpm' \
|
--exclude='*.rpm' \
|
||||||
-zcf \
|
-zcf \
|
||||||
"$package_temporary_dir/jellyfin-${VERSION}/jellyfin.tar.gz" \
|
"${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \
|
||||||
-C "../.." \
|
-C "../.." ./
|
||||||
./
|
|
||||||
echo "Extracting filtered package."
|
echo "Extracting filtered package."
|
||||||
tar -xzf "$package_temporary_dir/jellyfin-${VERSION}/jellyfin.tar.gz" -C "$package_temporary_dir/jellyfin-${VERSION}"
|
tar -xzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
|
||||||
echo "Removing filtered package."
|
echo "Removing filtered package."
|
||||||
rm "$package_temporary_dir/jellyfin-${VERSION}/jellyfin.tar.gz"
|
rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz"
|
||||||
echo "Repackaging package into final tarball."
|
echo "Repackaging package into final tarball."
|
||||||
tar -zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" -C "$package_temporary_dir" "jellyfin-${VERSION}"
|
tar -czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$docker_sudo docker build ../.. -t "$image_name" -f ./Dockerfile
|
# Set up the build environment Docker image
|
||||||
mkdir -p "$output_dir"
|
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
|
||||||
$docker_sudo docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
|
# Build the RPMs and copy out to ${package_temporary_dir}
|
||||||
chown -R "$current_user" "$package_temporary_dir" \
|
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}"
|
||||||
|| sudo chown -R "$current_user" "$package_temporary_dir"
|
# Correct ownership on the RPMs (as current user, then as root if that fails)
|
||||||
mv "$package_temporary_dir"/*.rpm "$output_dir"
|
chown -R "${current_user}" "${package_temporary_dir}" \
|
||||||
|
|| sudo chown -R "${current_user}" "${package_temporary_dir}"
|
||||||
|
# Move the RPMs to the output directory
|
||||||
|
mkdir -p "${output_dir}"
|
||||||
|
mv "${package_temporary_dir}"/rpm/* "${output_dir}"
|
||||||
|
|
21
deployment/ubuntu-package-x64/Dockerfile
Normal file
21
deployment/ubuntu-package-x64/Dockerfile
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
FROM microsoft/dotnet:2.2-sdk-bionic
|
||||||
|
# Docker build arguments
|
||||||
|
ARG SOURCE_DIR=/jellyfin
|
||||||
|
ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64
|
||||||
|
ARG ARTIFACT_DIR=/dist
|
||||||
|
# Docker run environment
|
||||||
|
ENV SOURCE_DIR=/jellyfin
|
||||||
|
ENV ARTIFACT_DIR=/dist
|
||||||
|
ENV DEB_BUILD_OPTIONS=noddebs
|
||||||
|
|
||||||
|
# Prepare Ubuntu build environment
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev \
|
||||||
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
|
&& mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
|
||||||
|
|
||||||
|
VOLUME ${ARTIFACT_DIR}/
|
||||||
|
|
||||||
|
COPY . ${SOURCE_DIR}/
|
||||||
|
|
||||||
|
ENTRYPOINT ["/docker-build.sh"]
|
29
deployment/ubuntu-package-x64/clean.sh
Executable file
29
deployment/ubuntu-package-x64/clean.sh
Executable file
|
@ -0,0 +1,29 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source ../common.build.sh
|
||||||
|
|
||||||
|
keep_artifacts="${1}"
|
||||||
|
|
||||||
|
WORKDIR="$( pwd )"
|
||||||
|
|
||||||
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-ubuntu-build"
|
||||||
|
|
||||||
|
rm -rf "${package_temporary_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${package_temporary_dir}" &>/dev/null
|
||||||
|
|
||||||
|
rm -rf "${output_dir}" &>/dev/null \
|
||||||
|
|| sudo rm -rf "${output_dir}" &>/dev/null
|
||||||
|
|
||||||
|
if [[ ${keep_artifacts} == 'n' ]]; then
|
||||||
|
docker_sudo=""
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo=sudo
|
||||||
|
fi
|
||||||
|
${docker_sudo} docker image rm ${image_name} --force
|
||||||
|
fi
|
1
deployment/ubuntu-package-x64/dependencies.txt
Normal file
1
deployment/ubuntu-package-x64/dependencies.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
docker
|
19
deployment/ubuntu-package-x64/docker-build.sh
Executable file
19
deployment/ubuntu-package-x64/docker-build.sh
Executable file
|
@ -0,0 +1,19 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Builds the DEB inside the Docker container
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Move to source directory
|
||||||
|
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
|
||||||
|
|
||||||
|
# Build DEB
|
||||||
|
dpkg-buildpackage -us -uc
|
||||||
|
|
||||||
|
# Move the artifacts out
|
||||||
|
mkdir -p ${ARTIFACT_DIR}/deb
|
||||||
|
mv /jellyfin_* ${ARTIFACT_DIR}/deb/
|
31
deployment/ubuntu-package-x64/package.sh
Executable file
31
deployment/ubuntu-package-x64/package.sh
Executable file
|
@ -0,0 +1,31 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source ../common.build.sh
|
||||||
|
|
||||||
|
WORKDIR="$( pwd )"
|
||||||
|
|
||||||
|
package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
|
||||||
|
output_dir="${WORKDIR}/pkg-dist"
|
||||||
|
current_user="$( whoami )"
|
||||||
|
image_name="jellyfin-ubuntu-build"
|
||||||
|
|
||||||
|
# Determine if sudo should be used for Docker
|
||||||
|
if [[ ! -z $(id -Gn | grep -q 'docker') ]] \
|
||||||
|
&& [[ ! ${EUID:-1000} -eq 0 ]] \
|
||||||
|
&& [[ ! ${USER} == "root" ]] \
|
||||||
|
&& [[ ! -z $( echo "${OSTYPE}" | grep -q "darwin" ) ]]; then
|
||||||
|
docker_sudo="sudo"
|
||||||
|
else
|
||||||
|
docker_sudo=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set up the build environment Docker image
|
||||||
|
${docker_sudo} docker build ../.. -t "${image_name}" -f ./Dockerfile
|
||||||
|
# Build the DEBs and copy out to ${package_temporary_dir}
|
||||||
|
${docker_sudo} docker run --rm -v "${package_temporary_dir}:/dist" "${image_name}"
|
||||||
|
# Correct ownership on the DEBs (as current user, then as root if that fails)
|
||||||
|
chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null \
|
||||||
|
|| sudo chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null
|
||||||
|
# Move the DEBs to the output directory
|
||||||
|
mkdir -p "${output_dir}"
|
||||||
|
mv "${package_temporary_dir}"/deb/* "${output_dir}"
|
1
deployment/ubuntu-package-x64/pkg-src
Symbolic link
1
deployment/ubuntu-package-x64/pkg-src
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../debian-package-x64/pkg-src
|
Loading…
Reference in a new issue