From 3014866f65eb1573e189867b42f8892fc54a2019 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 8 Feb 2019 21:08:34 -0500
Subject: Add similar Ubuntu build package

---
 deployment/ubuntu-package-x64/Dockerfile       | 40 ++++++++++++++++++++++++++
 deployment/ubuntu-package-x64/clean.sh         | 29 +++++++++++++++++++
 deployment/ubuntu-package-x64/dependencies.txt |  1 +
 deployment/ubuntu-package-x64/docker-build.sh  | 16 +++++++++++
 deployment/ubuntu-package-x64/package.sh       | 31 ++++++++++++++++++++
 deployment/ubuntu-package-x64/pkg-src          |  1 +
 6 files changed, 118 insertions(+)
 create mode 100644 deployment/ubuntu-package-x64/Dockerfile
 create mode 100755 deployment/ubuntu-package-x64/clean.sh
 create mode 100644 deployment/ubuntu-package-x64/dependencies.txt
 create mode 100755 deployment/ubuntu-package-x64/docker-build.sh
 create mode 100755 deployment/ubuntu-package-x64/package.sh
 create mode 120000 deployment/ubuntu-package-x64/pkg-src

(limited to 'deployment/ubuntu-package-x64')

diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile
new file mode 100644
index 000000000..471f50c27
--- /dev/null
+++ b/deployment/ubuntu-package-x64/Dockerfile
@@ -0,0 +1,40 @@
+FROM ubuntu:18.04
+# Docker build arguments
+ARG SOURCE_DIR=/jellyfin
+ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64
+ARG ARTIFACT_DIR=/dist
+ARG SDK_VERSION=2.2
+# Docker run environment
+ENV SOURCE_DIR=/jellyfin
+ENV ARTIFACT_DIR=/dist
+ENV DEB_BUILD_OPTIONS=noddebs
+
+# Prepare Debian 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
+
+# Install dotnet repository
+# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
+RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
+ && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
+ && wget -q https://packages.microsoft.com/config/ubuntu/18.04/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 \
+ && apt-get install -y dotnet-sdk-${SDK_VERSION} 
+
+# Link to docker-build script
+RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
+
+# Link to Debian source dir; mkdir needed or it fails, can't force dest
+RUN mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
+
+# Prepare artifact volume
+VOLUME ${ARTIFACT_DIR}/
+
+# Copy repository
+COPY . ${SOURCE_DIR}/
+
+# Set docker-build entrypoint
+ENTRYPOINT ["/docker-build.sh"]
diff --git a/deployment/ubuntu-package-x64/clean.sh b/deployment/ubuntu-package-x64/clean.sh
new file mode 100755
index 000000000..c92c7fdec
--- /dev/null
+++ b/deployment/ubuntu-package-x64/clean.sh
@@ -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
diff --git a/deployment/ubuntu-package-x64/dependencies.txt b/deployment/ubuntu-package-x64/dependencies.txt
new file mode 100644
index 000000000..bdb967096
--- /dev/null
+++ b/deployment/ubuntu-package-x64/dependencies.txt
@@ -0,0 +1 @@
+docker
diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh
new file mode 100755
index 000000000..83654b8ce
--- /dev/null
+++ b/deployment/ubuntu-package-x64/docker-build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Builds the DEB inside the Docker container
+
+set -o errexit
+set -o xtrace
+
+# Move to source directory
+pushd ${SOURCE_DIR}
+
+# Build DEB
+dpkg-buildpackage -us -uc
+
+# Move the artifacts out
+mkdir -p ${ARTIFACT_DIR}/deb
+mv /jellyfin_* ${ARTIFACT_DIR}/deb/
diff --git a/deployment/ubuntu-package-x64/package.sh b/deployment/ubuntu-package-x64/package.sh
new file mode 100755
index 000000000..6d4625a19
--- /dev/null
+++ b/deployment/ubuntu-package-x64/package.sh
@@ -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}"
diff --git a/deployment/ubuntu-package-x64/pkg-src b/deployment/ubuntu-package-x64/pkg-src
new file mode 120000
index 000000000..4c695fea1
--- /dev/null
+++ b/deployment/ubuntu-package-x64/pkg-src
@@ -0,0 +1 @@
+../debian-package-x64/pkg-src
\ No newline at end of file
-- 
cgit v1.2.3


From 7be4a8500c29d58dff9af5a3bf85edeb5d6b73b6 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sat, 9 Feb 2019 19:02:27 -0500
Subject: Use Microsoft dotnet Docker images

---
 deployment/debian-package-x64/Dockerfile | 24 ++++--------------------
 deployment/ubuntu-package-x64/Dockerfile | 26 +++++---------------------
 2 files changed, 9 insertions(+), 41 deletions(-)

(limited to 'deployment/ubuntu-package-x64')

diff --git a/deployment/debian-package-x64/Dockerfile b/deployment/debian-package-x64/Dockerfile
index 787f1d182..da66c9f94 100644
--- a/deployment/debian-package-x64/Dockerfile
+++ b/deployment/debian-package-x64/Dockerfile
@@ -1,9 +1,8 @@
-FROM debian:9
+FROM microsoft/dotnet:2.2-sdk-stretch
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-x64
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=2.2
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
@@ -11,24 +10,9 @@ ENV DEB_BUILD_OPTIONS=noddebs
 
 # Prepare Debian 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
-
-# Install dotnet repository
-# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
- && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
- && 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 \
- && apt-get install -y dotnet-sdk-${SDK_VERSION} 
-
-# Link to docker-build script
-RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
-
-# Link to Debian source dir; mkdir needed or it fails, can't force dest
-RUN mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
+ && 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
 
 # Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile
index 471f50c27..047d6a7a2 100644
--- a/deployment/ubuntu-package-x64/Dockerfile
+++ b/deployment/ubuntu-package-x64/Dockerfile
@@ -1,34 +1,18 @@
-FROM ubuntu:18.04
+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
-ARG SDK_VERSION=2.2
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
 ENV DEB_BUILD_OPTIONS=noddebs
 
-# Prepare Debian build environment
+# 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
-
-# Install dotnet repository
-# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
- && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
- && wget -q https://packages.microsoft.com/config/ubuntu/18.04/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 \
- && apt-get install -y dotnet-sdk-${SDK_VERSION} 
-
-# Link to docker-build script
-RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
-
-# Link to Debian source dir; mkdir needed or it fails, can't force dest
-RUN mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
+ && 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
 
 # Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
-- 
cgit v1.2.3


From 00234a5ece42126ec5039aa243d4a679589be33e Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sat, 9 Feb 2019 19:12:55 -0500
Subject: Remove superfluous comments

---
 deployment/centos-package-x64/Dockerfile | 3 ---
 deployment/debian-package-x64/Dockerfile | 3 ---
 deployment/fedora-package-x64/Dockerfile | 3 ---
 deployment/ubuntu-package-x64/Dockerfile | 3 ---
 4 files changed, 12 deletions(-)

(limited to 'deployment/ubuntu-package-x64')

diff --git a/deployment/centos-package-x64/Dockerfile b/deployment/centos-package-x64/Dockerfile
index 4cb288c84..38853f173 100644
--- a/deployment/centos-package-x64/Dockerfile
+++ b/deployment/centos-package-x64/Dockerfile
@@ -20,11 +20,8 @@ RUN yum update -y \
  && mkdir -p ${SOURCE_DIR}/SOURCES \
  && ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
 
-# Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
 
-# Copy repository
 COPY . ${SOURCE_DIR}/
 
-# Set docker-build entrypoint
 ENTRYPOINT ["/docker-build.sh"]
diff --git a/deployment/debian-package-x64/Dockerfile b/deployment/debian-package-x64/Dockerfile
index da66c9f94..9819cc20d 100644
--- a/deployment/debian-package-x64/Dockerfile
+++ b/deployment/debian-package-x64/Dockerfile
@@ -14,11 +14,8 @@ RUN apt-get update \
  && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
  && mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
 
-# Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
 
-# Copy repository
 COPY . ${SOURCE_DIR}/
 
-# Set docker-build entrypoint
 ENTRYPOINT ["/docker-build.sh"]
diff --git a/deployment/fedora-package-x64/Dockerfile b/deployment/fedora-package-x64/Dockerfile
index 944f489b5..8bb1d527d 100644
--- a/deployment/fedora-package-x64/Dockerfile
+++ b/deployment/fedora-package-x64/Dockerfile
@@ -20,11 +20,8 @@ RUN dnf update -y \
  && mkdir -p ${SOURCE_DIR}/SOURCES \
  && ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
 
-# Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
 
-# Copy repository
 COPY . ${SOURCE_DIR}/
 
-# Set docker-build entrypoint
 ENTRYPOINT ["/docker-build.sh"]
diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile
index 047d6a7a2..485b6c42c 100644
--- a/deployment/ubuntu-package-x64/Dockerfile
+++ b/deployment/ubuntu-package-x64/Dockerfile
@@ -14,11 +14,8 @@ RUN apt-get update \
  && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
  && mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
 
-# Prepare artifact volume
 VOLUME ${ARTIFACT_DIR}/
 
-# Copy repository
 COPY . ${SOURCE_DIR}/
 
-# Set docker-build entrypoint
 ENTRYPOINT ["/docker-build.sh"]
-- 
cgit v1.2.3


From fb256b7aa0cf500c54fd1a1fa8295a0dac9520b1 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sat, 9 Feb 2019 19:32:06 -0500
Subject: Fix control file for Microsoft Docker setup

---
 deployment/debian-package-x64/docker-build.sh | 3 +++
 deployment/ubuntu-package-x64/docker-build.sh | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'deployment/ubuntu-package-x64')

diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh
index 83654b8ce..0590be097 100755
--- a/deployment/debian-package-x64/docker-build.sh
+++ b/deployment/debian-package-x64/docker-build.sh
@@ -8,6 +8,9 @@ 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
 
diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh
index 83654b8ce..0590be097 100755
--- a/deployment/ubuntu-package-x64/docker-build.sh
+++ b/deployment/ubuntu-package-x64/docker-build.sh
@@ -8,6 +8,9 @@ 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
 
-- 
cgit v1.2.3