Mirrors/FFmpeg-Builds
1
0
Fork 0
mirror of https://github.com/BtbN/FFmpeg-Builds.git synced 2025-04-29 14:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify rootless-test

Browse Source
This commit is contained in:
BtbN 2024-09-04 17:45:04 +02:00
parent c8a866092a
commit e7b51ec84e
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -10,13 +10,11 @@ for addin in ${ADDINS[*]}; do
source "addins/${addin}.sh" source "addins/${addin}.sh"
done done
TESTFILE="uidtestfile" if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then
rm -f "$TESTFILE" UIDARGS=()
docker run --rm -v "$PWD:/uidtestdir" "$IMAGE" touch "/uidtestdir/$TESTFILE" else
DOCKERUID="$(stat -c "%u" "$TESTFILE")" UIDARGS=( -u "$(id -u):$(id -g)" )
rm -f "$TESTFILE" fi
[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=()
unset TESTFILE
rm -rf ffbuild rm -rf ffbuild
mkdir ffbuild mkdir ffbuild

12
download.sh
View File

@ -3,13 +3,11 @@ set -xe
cd "$(dirname "$0")" cd "$(dirname "$0")"
source util/vars.sh dl only source util/vars.sh dl only
TESTFILE="uidtestfile" if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then
rm -f "$TESTFILE" UIDARGS=()
docker run --rm -v "$PWD:/uidtestdir" "${REGISTRY}/${REPO}/base:latest" touch "/uidtestdir/$TESTFILE" else
DOCKERUID="$(stat -c "%u" "$TESTFILE")" UIDARGS=( -u "$(id -u):$(id -g)" )
rm -f "$TESTFILE" fi
[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=()
unset TESTFILE
[[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG="" [[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG=""