casjaysdevdocker/ntfy
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/ntfy synced 2025-01-18 12:34:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️

Browse Source 
rootfs/usr/local/etc/docker/functions/entrypoint.sh
This commit is contained in:
casjay 2024-08-01 15:06:07 -04:00
parent 83497277a0
commit f03d488ac4
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootfs/usr/local/etc/docker/functions/entrypoint.sh
View File

@ -495,13 +495,13 @@ __set_user_group_id() {
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__create_service_user() {
local exitStatus=0
local set_home_dir=""
local create_user="${1:-$SERVICE_USER}"
local create_group="${2:-${SERVICE_GROUP:-$create_user}}"
local create_home_dir="${3:-${WORK_DIR:-/home/$create_user}}"
local create_home_dir="${3:-$WORK_DIR}"
local create_uid="${4:-${SERVICE_UID:-$USER_UID}}"
local create_gid="${5:-${SERVICE_GID:-$USER_GID}}"
local random_id="$(__generate_random_uids)"
local create_home_dir="${create_home_dir:-/home/$create_user}"
grep -sq "^$create_user:" "/etc/passwd" && grep -sq "^$create_group:" "/etc/group" && return
[ "$create_user" = "root" ] && [ "$create_group" = "root" ] && return 0
if [ "$RUNAS_USER" != "root" ] && [ "$RUNAS_USER" != "" ]; then
@ -532,7 +532,7 @@ __create_service_user() {
fi
grep -qs "$create_group" "/etc/group" || exitStatus=$((exitCode + 1))
grep -qs "$create_user" "/etc/passwd" || exitStatus=$((exitCode + 1))
[ $exitStatus -eq 0 ] && export WORK_DIR="${set_home_dir:-}"
[ $exitStatus -eq 0 ] && export WORK_DIR="${create_home_dir:-}"
if [ -n "$WORK_DIR" ]; then
[ -d "$WORK_DIR" ] || mkdir -p "$WORK_DIR"
[ -d "/etc/.skel" ] && cp -Rf /etc/.skel/. "$WORK_DIR/"