From f36b898a4d7623520f6ee88d1242d73afade52b1 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Wed, 25 Sep 2019 00:39:21 -0400
Subject: Port Linux build to Docker and add web build

---
 deployment/linux-x64/Dockerfile       | 37 +++++++++++++++++++++++++++++++++++
 deployment/linux-x64/build.sh         |  7 -------
 deployment/linux-x64/clean.sh         | 26 +++++++++++++++++++++---
 deployment/linux-x64/dependencies.txt |  2 +-
 deployment/linux-x64/docker-build.sh  | 36 ++++++++++++++++++++++++++++++++++
 deployment/linux-x64/package.sh       | 33 ++++++++++++++++++++++++++++---
 6 files changed, 127 insertions(+), 14 deletions(-)
 create mode 100644 deployment/linux-x64/Dockerfile
 delete mode 100755 deployment/linux-x64/build.sh
 create mode 100755 deployment/linux-x64/docker-build.sh

(limited to 'deployment/linux-x64')

diff --git a/deployment/linux-x64/Dockerfile b/deployment/linux-x64/Dockerfile
new file mode 100644
index 0000000000..5490bead51
--- /dev/null
+++ b/deployment/linux-x64/Dockerfile
@@ -0,0 +1,37 @@
+FROM debian:10
+# Docker build arguments
+ARG SOURCE_DIR=/jellyfin
+ARG PLATFORM_DIR=/jellyfin/deployment/linux-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
+ENV ARCH=amd64
+
+# 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 libssl-dev libssl1.1 liblttng-ust0
+
+# Install dotnet repository
+# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
+RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-45ab-8c88-fa36165701b9/16ce29a06031eeb09058dee94d6f5330/dotnet-sdk-2.2.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+ && mkdir -p dotnet-sdk \
+ && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
+ && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
+
+# Install yarn package manager
+RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && apt update \
+ && apt install -y yarn
+
+# Link to docker-build script
+RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
+
+VOLUME ${ARTIFACT_DIR}/
+
+COPY . ${SOURCE_DIR}/
+
+ENTRYPOINT ["/docker-build.sh"]
diff --git a/deployment/linux-x64/build.sh b/deployment/linux-x64/build.sh
deleted file mode 100755
index 1f0fb62d36..0000000000
--- a/deployment/linux-x64/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-source ../common.build.sh
-
-VERSION=`get_version ../..`
-
-build_jellyfin ../../Jellyfin.Server Release linux-x64 `pwd`/dist/jellyfin_${VERSION}
diff --git a/deployment/linux-x64/clean.sh b/deployment/linux-x64/clean.sh
index 3df2d7796e..c07501a7bb 100755
--- a/deployment/linux-x64/clean.sh
+++ b/deployment/linux-x64/clean.sh
@@ -1,7 +1,27 @@
 #!/usr/bin/env bash
 
-source ../common.build.sh
+keep_artifacts="${1}"
 
-VERSION=`get_version ../..`
+WORKDIR="$( pwd )"
 
-clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION}
+package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
+output_dir="${WORKDIR}/pkg-dist"
+current_user="$( whoami )"
+image_name="jellyfin-linux-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/linux-x64/dependencies.txt b/deployment/linux-x64/dependencies.txt
index 3d25d1bdf4..bdb9670965 100644
--- a/deployment/linux-x64/dependencies.txt
+++ b/deployment/linux-x64/dependencies.txt
@@ -1 +1 @@
-dotnet
+docker
diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh
new file mode 100755
index 0000000000..38efe5626c
--- /dev/null
+++ b/deployment/linux-x64/docker-build.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Builds the TAR archive inside the Docker container
+
+set -o errexit
+set -o xtrace
+
+# Move to source directory
+pushd ${SOURCE_DIR}
+
+# Clone down and build Web frontend
+web_build_dir="$( mktemp -d )"
+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}
+fi
+yarn install
+yarn build
+mkdir -p ${web_target}
+mv dist/* ${web_target}/
+popd
+
+# Get version
+version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
+
+# Build archives
+dotnet publish --configuration Release --self-contained --runtime linux-x64 --output /dist/jellyfin_${version}/ "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none;UseAppHost=true"
+tar -cvzf /jellyfin_${version}.portable.tar.gz -C /dist jellyfin_${version}
+rm -rf /dist/jellyfin_${version}
+
+# Move the artifacts out
+mkdir -p ${ARTIFACT_DIR}/
+mv /jellyfin[-_]*.tar.gz ${ARTIFACT_DIR}/
+chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
diff --git a/deployment/linux-x64/package.sh b/deployment/linux-x64/package.sh
index 13b943ea8f..dfe8a9aa4a 100755
--- a/deployment/linux-x64/package.sh
+++ b/deployment/linux-x64/package.sh
@@ -1,7 +1,34 @@
 #!/usr/bin/env bash
 
-source ../common.build.sh
+args="${@}"
+declare -a docker_envvars
+for arg in ${args}; do
+    docker_envvars+=("-e ${arg}")
+done
 
-VERSION=`get_version ../..`
+WORKDIR="$( pwd )"
 
-package_portable ../.. `pwd`/dist/jellyfin_${VERSION}
+package_temporary_dir="${WORKDIR}/pkg-dist-tmp"
+output_dir="${WORKDIR}/pkg-dist"
+current_user="$( whoami )"
+image_name="jellyfin-linux-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
+
+# Prepare temporary package dir
+mkdir -p "${package_temporary_dir}"
+# 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}" ${docker_envvars}
+# Move the DEBs to the output directory
+mkdir -p "${output_dir}"
+mv "${package_temporary_dir}"/* "${output_dir}"
-- 
cgit v1.2.3


From 4b257b7b4a5b6db49df7e7f26bf9c45e0439ac6d Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Wed, 25 Sep 2019 01:36:20 -0400
Subject: Clean up web_build_dir in docker-build.sh

---
 deployment/centos-package-x64/docker-build.sh   | 1 +
 deployment/debian-package-arm64/docker-build.sh | 1 +
 deployment/debian-package-armhf/docker-build.sh | 2 +-
 deployment/debian-package-x64/docker-build.sh   | 1 +
 deployment/fedora-package-x64/docker-build.sh   | 1 +
 deployment/linux-x64/docker-build.sh            | 1 +
 deployment/macos/docker-build.sh                | 1 +
 deployment/portable/docker-build.sh             | 1 +
 deployment/ubuntu-package-arm64/docker-build.sh | 1 +
 deployment/ubuntu-package-armhf/docker-build.sh | 1 +
 deployment/ubuntu-package-x64/docker-build.sh   | 1 +
 deployment/win-x64/docker-build.sh              | 2 ++
 deployment/win-x86/docker-build.sh              | 2 ++
 13 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'deployment/linux-x64')

diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh
index f08b5277d2..c97bfb9b4a 100755
--- a/deployment/centos-package-x64/docker-build.sh
+++ b/deployment/centos-package-x64/docker-build.sh
@@ -21,6 +21,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build RPM
 spectool -g -R SPECS/jellyfin.spec
diff --git a/deployment/debian-package-arm64/docker-build.sh b/deployment/debian-package-arm64/docker-build.sh
index acf6ac0132..713cbef34d 100755
--- a/deployment/debian-package-arm64/docker-build.sh
+++ b/deployment/debian-package-arm64/docker-build.sh
@@ -24,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}
diff --git a/deployment/debian-package-armhf/docker-build.sh b/deployment/debian-package-armhf/docker-build.sh
index 4ca3c751f8..470bbc75c5 100755
--- a/deployment/debian-package-armhf/docker-build.sh
+++ b/deployment/debian-package-armhf/docker-build.sh
@@ -11,7 +11,6 @@ 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
 
-
 # Clone down and build Web frontend
 web_build_dir="$( mktemp -d )"
 web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
@@ -25,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}
diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh
index 544682edf7..94286529cd 100755
--- a/deployment/debian-package-x64/docker-build.sh
+++ b/deployment/debian-package-x64/docker-build.sh
@@ -24,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 dpkg-buildpackage -us -uc
diff --git a/deployment/fedora-package-x64/docker-build.sh b/deployment/fedora-package-x64/docker-build.sh
index f08b5277d2..c97bfb9b4a 100755
--- a/deployment/fedora-package-x64/docker-build.sh
+++ b/deployment/fedora-package-x64/docker-build.sh
@@ -21,6 +21,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build RPM
 spectool -g -R SPECS/jellyfin.spec
diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh
index 38efe5626c..5440b496ee 100755
--- a/deployment/linux-x64/docker-build.sh
+++ b/deployment/linux-x64/docker-build.sh
@@ -21,6 +21,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Get version
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh
index c56825b8c4..0f1701cc24 100755
--- a/deployment/macos/docker-build.sh
+++ b/deployment/macos/docker-build.sh
@@ -21,6 +21,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Get version
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh
index 42804e4b00..422587c4c3 100755
--- a/deployment/portable/docker-build.sh
+++ b/deployment/portable/docker-build.sh
@@ -21,6 +21,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Get version
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
diff --git a/deployment/ubuntu-package-arm64/docker-build.sh b/deployment/ubuntu-package-arm64/docker-build.sh
index acf6ac0132..713cbef34d 100755
--- a/deployment/ubuntu-package-arm64/docker-build.sh
+++ b/deployment/ubuntu-package-arm64/docker-build.sh
@@ -24,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}
diff --git a/deployment/ubuntu-package-armhf/docker-build.sh b/deployment/ubuntu-package-armhf/docker-build.sh
index a22b162cdd..470bbc75c5 100755
--- a/deployment/ubuntu-package-armhf/docker-build.sh
+++ b/deployment/ubuntu-package-armhf/docker-build.sh
@@ -24,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}
diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh
index 544682edf7..94286529cd 100755
--- a/deployment/ubuntu-package-x64/docker-build.sh
+++ b/deployment/ubuntu-package-x64/docker-build.sh
@@ -24,6 +24,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Build DEB
 dpkg-buildpackage -us -uc
diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh
index f2092f19e0..ea93db7cb4 100755
--- a/deployment/win-x64/docker-build.sh
+++ b/deployment/win-x64/docker-build.sh
@@ -27,6 +27,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Get version
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
@@ -43,6 +44,7 @@ cp ${addin_build_dir}/${NSSM_VERSION}/win64/nssm.exe /dist/jellyfin_${version}/n
 unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir}
 cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe
 cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe
+rm -rf ${addin_build_dir}
 
 # Prepare scripts
 cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1
diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh
index fced38eabd..dd92bb3064 100755
--- a/deployment/win-x86/docker-build.sh
+++ b/deployment/win-x86/docker-build.sh
@@ -27,6 +27,7 @@ yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
+rm -rf ${web_build_dir}
 
 # Get version
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
@@ -43,6 +44,7 @@ cp ${addin_build_dir}/${NSSM_VERSION}/win64/nssm.exe /dist/jellyfin_${version}/n
 unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir}
 cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe
 cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe
+rm -rf ${addin_build_dir}
 
 # Prepare scripts
 cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1
-- 
cgit v1.2.3


From 56a879e148bf3e70b67ace82d9f0f9e52b6b3de4 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Wed, 25 Sep 2019 14:20:00 -0400
Subject: Use redirection instead of tee

---
 deployment/debian-package-arm64/Dockerfile.amd64 | 2 +-
 deployment/debian-package-armhf/Dockerfile.amd64 | 2 +-
 deployment/debian-package-armhf/Dockerfile.armhf | 2 +-
 deployment/debian-package-x64/Dockerfile         | 2 +-
 deployment/linux-x64/Dockerfile                  | 2 +-
 deployment/macos/Dockerfile                      | 2 +-
 deployment/portable/Dockerfile                   | 2 +-
 deployment/ubuntu-package-arm64/Dockerfile.amd64 | 2 +-
 deployment/ubuntu-package-armhf/Dockerfile.amd64 | 2 +-
 deployment/ubuntu-package-armhf/Dockerfile.armhf | 2 +-
 deployment/ubuntu-package-x64/Dockerfile         | 2 +-
 deployment/win-x64/Dockerfile                    | 2 +-
 deployment/win-x86/Dockerfile                    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'deployment/linux-x64')

diff --git a/deployment/debian-package-arm64/Dockerfile.amd64 b/deployment/debian-package-arm64/Dockerfile.amd64
index 36566257e9..5644c14704 100644
--- a/deployment/debian-package-arm64/Dockerfile.amd64
+++ b/deployment/debian-package-arm64/Dockerfile.amd64
@@ -31,7 +31,7 @@ RUN dpkg --add-architecture arm64 \
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/debian-package-armhf/Dockerfile.amd64 b/deployment/debian-package-armhf/Dockerfile.amd64
index 4f34c7e41f..b05f10def2 100644
--- a/deployment/debian-package-armhf/Dockerfile.amd64
+++ b/deployment/debian-package-armhf/Dockerfile.amd64
@@ -31,7 +31,7 @@ RUN dpkg --add-architecture armhf \
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/debian-package-armhf/Dockerfile.armhf b/deployment/debian-package-armhf/Dockerfile.armhf
index 339de430fa..6729d8f389 100644
--- a/deployment/debian-package-armhf/Dockerfile.armhf
+++ b/deployment/debian-package-armhf/Dockerfile.armhf
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/3cb1d917-19cc-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/debian-package-x64/Dockerfile b/deployment/debian-package-x64/Dockerfile
index d9c4768033..2f97d39445 100644
--- a/deployment/debian-package-x64/Dockerfile
+++ b/deployment/debian-package-x64/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/linux-x64/Dockerfile b/deployment/linux-x64/Dockerfile
index 5490bead51..d634b55de9 100644
--- a/deployment/linux-x64/Dockerfile
+++ b/deployment/linux-x64/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/macos/Dockerfile b/deployment/macos/Dockerfile
index ef398748a6..406a2d853e 100644
--- a/deployment/macos/Dockerfile
+++ b/deployment/macos/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/portable/Dockerfile b/deployment/portable/Dockerfile
index 393ff6ec31..bdbf978fe7 100644
--- a/deployment/portable/Dockerfile
+++ b/deployment/portable/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/ubuntu-package-arm64/Dockerfile.amd64 b/deployment/ubuntu-package-arm64/Dockerfile.amd64
index 2afc372d66..838e70d505 100644
--- a/deployment/ubuntu-package-arm64/Dockerfile.amd64
+++ b/deployment/ubuntu-package-arm64/Dockerfile.amd64
@@ -42,7 +42,7 @@ RUN rm /etc/apt/sources.list \
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/ubuntu-package-armhf/Dockerfile.amd64 b/deployment/ubuntu-package-armhf/Dockerfile.amd64
index 9fd43d53f4..d1123e0b61 100644
--- a/deployment/ubuntu-package-armhf/Dockerfile.amd64
+++ b/deployment/ubuntu-package-armhf/Dockerfile.amd64
@@ -42,7 +42,7 @@ RUN rm /etc/apt/sources.list \
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/ubuntu-package-armhf/Dockerfile.armhf b/deployment/ubuntu-package-armhf/Dockerfile.armhf
index 6b1927b08e..c9e093e51e 100644
--- a/deployment/ubuntu-package-armhf/Dockerfile.armhf
+++ b/deployment/ubuntu-package-armhf/Dockerfile.armhf
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/d9f37b73-df8d-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/ubuntu-package-x64/Dockerfile b/deployment/ubuntu-package-x64/Dockerfile
index 31164121c3..1749d2ad04 100644
--- a/deployment/ubuntu-package-x64/Dockerfile
+++ b/deployment/ubuntu-package-x64/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/win-x64/Dockerfile b/deployment/win-x64/Dockerfile
index 23bf33b155..7f64c7daed 100644
--- a/deployment/win-x64/Dockerfile
+++ b/deployment/win-x64/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
diff --git a/deployment/win-x86/Dockerfile b/deployment/win-x86/Dockerfile
index 91a575b3e9..fb5f5d6b61 100644
--- a/deployment/win-x86/Dockerfile
+++ b/deployment/win-x86/Dockerfile
@@ -23,7 +23,7 @@ RUN wget https://download.visualstudio.microsoft.com/download/pr/228832ea-805f-4
 
 # Install yarn package manager
 RUN wget -q -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
- && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
  && apt update \
  && apt install -y yarn
 
-- 
cgit v1.2.3


From 547a6121b05cf55c344e182fa29140dba52c23a3 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Thu, 26 Sep 2019 22:09:19 -0400
Subject: Remove redundant yarn build command

---
 deployment/centos-package-x64/docker-build.sh   | 1 -
 deployment/debian-package-arm64/docker-build.sh | 1 -
 deployment/debian-package-armhf/docker-build.sh | 1 -
 deployment/debian-package-x64/docker-build.sh   | 1 -
 deployment/fedora-package-x64/docker-build.sh   | 1 -
 deployment/linux-x64/docker-build.sh            | 1 -
 deployment/macos/docker-build.sh                | 1 -
 deployment/portable/docker-build.sh             | 1 -
 deployment/ubuntu-package-arm64/docker-build.sh | 1 -
 deployment/ubuntu-package-armhf/docker-build.sh | 1 -
 deployment/ubuntu-package-x64/docker-build.sh   | 1 -
 deployment/win-x64/docker-build.sh              | 1 -
 deployment/win-x86/docker-build.sh              | 1 -
 13 files changed, 13 deletions(-)

(limited to 'deployment/linux-x64')

diff --git a/deployment/centos-package-x64/docker-build.sh b/deployment/centos-package-x64/docker-build.sh
index 8560f5ff36..014f582f08 100755
--- a/deployment/centos-package-x64/docker-build.sh
+++ b/deployment/centos-package-x64/docker-build.sh
@@ -19,7 +19,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/debian-package-arm64/docker-build.sh b/deployment/debian-package-arm64/docker-build.sh
index 713cbef34d..7a13bafcbb 100755
--- a/deployment/debian-package-arm64/docker-build.sh
+++ b/deployment/debian-package-arm64/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/debian-package-armhf/docker-build.sh b/deployment/debian-package-armhf/docker-build.sh
index 470bbc75c5..c48ccb3fb8 100755
--- a/deployment/debian-package-armhf/docker-build.sh
+++ b/deployment/debian-package-armhf/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh
index 94286529cd..97bc45a060 100755
--- a/deployment/debian-package-x64/docker-build.sh
+++ b/deployment/debian-package-x64/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/fedora-package-x64/docker-build.sh b/deployment/fedora-package-x64/docker-build.sh
index 8560f5ff36..014f582f08 100755
--- a/deployment/fedora-package-x64/docker-build.sh
+++ b/deployment/fedora-package-x64/docker-build.sh
@@ -19,7 +19,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh
index 5440b496ee..8860f943c9 100755
--- a/deployment/linux-x64/docker-build.sh
+++ b/deployment/linux-x64/docker-build.sh
@@ -17,7 +17,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh
index 0f1701cc24..1b4a554e6d 100755
--- a/deployment/macos/docker-build.sh
+++ b/deployment/macos/docker-build.sh
@@ -17,7 +17,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh
index 422587c4c3..3645522d12 100755
--- a/deployment/portable/docker-build.sh
+++ b/deployment/portable/docker-build.sh
@@ -17,7 +17,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/ubuntu-package-arm64/docker-build.sh b/deployment/ubuntu-package-arm64/docker-build.sh
index 713cbef34d..7a13bafcbb 100755
--- a/deployment/ubuntu-package-arm64/docker-build.sh
+++ b/deployment/ubuntu-package-arm64/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/ubuntu-package-armhf/docker-build.sh b/deployment/ubuntu-package-armhf/docker-build.sh
index 470bbc75c5..c48ccb3fb8 100755
--- a/deployment/ubuntu-package-armhf/docker-build.sh
+++ b/deployment/ubuntu-package-armhf/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/ubuntu-package-x64/docker-build.sh b/deployment/ubuntu-package-x64/docker-build.sh
index 94286529cd..97bc45a060 100755
--- a/deployment/ubuntu-package-x64/docker-build.sh
+++ b/deployment/ubuntu-package-x64/docker-build.sh
@@ -20,7 +20,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh
index ea93db7cb4..36d6f77fc5 100755
--- a/deployment/win-x64/docker-build.sh
+++ b/deployment/win-x64/docker-build.sh
@@ -23,7 +23,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh
index dd92bb3064..86ede74524 100755
--- a/deployment/win-x86/docker-build.sh
+++ b/deployment/win-x86/docker-build.sh
@@ -23,7 +23,6 @@ if [[ -n ${web_branch} ]]; then
     checkout -b origin/${web_branch}
 fi
 yarn install
-yarn build
 mkdir -p ${web_target}
 mv dist/* ${web_target}/
 popd
-- 
cgit v1.2.3