aboutsummaryrefslogtreecommitdiff
path: root/deployment/debian-package-x64
diff options
context:
space:
mode:
authorOdd Stråbø <oddstr13@openshell.no>2019-04-25 05:33:17 +0200
committerOdd Stråbø <oddstr13@openshell.no>2019-05-01 20:32:15 +0200
commit3634d367c1809a2ff53b0583bd19b87e860d966e (patch)
treefb0f7267ae93b6e82d36fc725705a7cc8e23ee9d /deployment/debian-package-x64
parente8196fed7cdc43f83f666af477652a90f41b5961 (diff)
Move artifact chown inside docker to avoid sudo
Diffstat (limited to 'deployment/debian-package-x64')
-rwxr-xr-xdeployment/debian-package-x64/docker-build.sh1
-rwxr-xr-xdeployment/debian-package-x64/package.sh5
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment/debian-package-x64/docker-build.sh b/deployment/debian-package-x64/docker-build.sh
index 0590be0972..07f726dcc8 100755
--- a/deployment/debian-package-x64/docker-build.sh
+++ b/deployment/debian-package-x64/docker-build.sh
@@ -17,3 +17,4 @@ dpkg-buildpackage -us -uc
# Move the artifacts out
mkdir -p ${ARTIFACT_DIR}/deb
mv /jellyfin_* ${ARTIFACT_DIR}/deb/
+chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
diff --git a/deployment/debian-package-x64/package.sh b/deployment/debian-package-x64/package.sh
index d7c3f5809c..2530e253bd 100755
--- a/deployment/debian-package-x64/package.sh
+++ b/deployment/debian-package-x64/package.sh
@@ -19,13 +19,12 @@ 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}"
-# 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}"