suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure.sh: Detect rootless container setups.

Browse source 
Until now the option had to be added by hand to the Makefile or
specified each `make` invocation.
This commit is contained in:
Arkadiusz Hiler 2021-06-14 16:20:12 +03:00 committed by Andrew Eikum
parent 82ae47758f
commit c52532efce
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.sh
View file

@ -62,6 +62,22 @@ check_container_engine() {
if ! cmd $arg_container_engine run --rm $arg_protonsdk_image; then if ! cmd $arg_container_engine run --rm $arg_protonsdk_image; then
die "Broken container engine. Please fix your $arg_container_engine setup." die "Broken container engine. Please fix your $arg_container_engine setup."
fi fi
touch permission_check
local inner_uid="$($arg_container_engine run -v "$(pwd):/test" \
--rm $arg_protonsdk_image \
stat --format "%u" /test/permission_check)"
rm permission_check
if [ "$inner_uid" -eq 0 ]; then
# namespace maps the user as root or the build is performed as host's root
ROOTLESS_CONTAINER=1
elif [ "$inner_uid" -eq "$(id -u)" ]; then
ROOTLESS_CONTAINER=0
else
err "File owner's UID doesn't map to 0 or $(id -u) in the container."
die "Don't know how to map permissions. Please check your $arg_container_engine setup."
fi
} }
# #
@ -133,6 +149,7 @@ function configure() {
echo "STEAMRT_NAME := $(escape_for_make "$steamrt_name")" echo "STEAMRT_NAME := $(escape_for_make "$steamrt_name")"
echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")" echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")"
echo "ROOTLESS_CONTAINER := $ROOTLESS_CONTAINER"
echo "CONTAINER_ENGINE := $arg_container_engine" echo "CONTAINER_ENGINE := $arg_container_engine"
if [[ -n "$arg_docker_opts" ]]; then if [[ -n "$arg_docker_opts" ]]; then
echo "DOCKER_OPTS := $arg_docker_opts" echo "DOCKER_OPTS := $arg_docker_opts"