mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-07-26 18:14:37 -05:00
Prefers the long options to commands
This commit is contained in:
parent
221fd58d69
commit
af5fcc1db8
@ -28,8 +28,8 @@ declare -r extra_dirs=(
|
|||||||
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
||||||
# Non-root mode: Create directories as current user, warn about permission issues
|
# Non-root mode: Create directories as current user, warn about permission issues
|
||||||
echo "${log_prefix} Running in non-root mode, checking directories"
|
echo "${log_prefix} Running in non-root mode, checking directories"
|
||||||
current_uid=$(id -u)
|
current_uid=$(id --user)
|
||||||
current_gid=$(id -g)
|
current_gid=$(id --group)
|
||||||
|
|
||||||
for dir in "${extra_dirs[@]}"; do
|
for dir in "${extra_dirs[@]}"; do
|
||||||
if [[ ! -d "${dir}" ]]; then
|
if [[ ! -d "${dir}" ]]; then
|
||||||
|
@ -11,9 +11,9 @@ printf "/usr/src/paperless/src" > /var/run/s6/container_environment/PAPERLESS_SR
|
|||||||
echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
|
echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
|
||||||
|
|
||||||
# Check if we're starting as a non-root user
|
# Check if we're starting as a non-root user
|
||||||
if [ "$(id -u)" != "0" ]; then
|
if [ "$(id --user)" != "0" ]; then
|
||||||
printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
|
printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
|
||||||
echo "${log_prefix} paperless-ngx docker container running under a user ($(id -u):$(id -g))"
|
echo "${log_prefix} paperless-ngx docker container running under a user ($(id --user):$(id --group))"
|
||||||
else
|
else
|
||||||
printf "/usr/src/paperless" > /var/run/s6/container_environment/HOME
|
printf "/usr/src/paperless" > /var/run/s6/container_environment/HOME
|
||||||
echo "${log_prefix} paperless-ngx docker container starting init as root"
|
echo "${log_prefix} paperless-ngx docker container starting init as root"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user