diff options
| author | Odd Stråbø <oddstr13@openshell.no> | 2019-04-25 05:33:17 +0200 |
|---|---|---|
| committer | Odd Stråbø <oddstr13@openshell.no> | 2019-05-01 20:32:15 +0200 |
| commit | 3634d367c1809a2ff53b0583bd19b87e860d966e (patch) | |
| tree | fb0f7267ae93b6e82d36fc725705a7cc8e23ee9d /deployment/fedora-package-x64 | |
| parent | e8196fed7cdc43f83f666af477652a90f41b5961 (diff) | |
Move artifact chown inside docker to avoid sudo
Diffstat (limited to 'deployment/fedora-package-x64')
| -rwxr-xr-x | deployment/fedora-package-x64/docker-build.sh | 1 | ||||
| -rwxr-xr-x | deployment/fedora-package-x64/package.sh | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment/fedora-package-x64/docker-build.sh b/deployment/fedora-package-x64/docker-build.sh index 3acf1ec0df..cefb1652e9 100755 --- a/deployment/fedora-package-x64/docker-build.sh +++ b/deployment/fedora-package-x64/docker-build.sh @@ -18,3 +18,4 @@ rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg- # 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/ +chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh index eed29aef3c..e659ee5e9e 100755 --- a/deployment/fedora-package-x64/package.sh +++ b/deployment/fedora-package-x64/package.sh @@ -23,13 +23,12 @@ fi ./create_tarball.sh +# 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 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}" |