feat: add environment variable puid and pgid #2011
This commit is contained in:
Fernando OK
26
docker/entrypoint/docker-entrypoint.d/00-user-setup.sh
Executable file
26
docker/entrypoint/docker-entrypoint.d/00-user-setup.sh
Executable file
@@ -0,0 +1,26 @@
|
||||
#!/bin/sh
|
||||
|
||||
HOMARR_USER_PATHS="/app/data /app/public/icons"
|
||||
|
||||
for path in $HOMARR_USER_PATHS
|
||||
do
|
||||
if [ ! -d "$path" ]; then
|
||||
mkdir -p $path
|
||||
fi
|
||||
|
||||
find $path ! -user $PUID -print0 | while read -d $'\0' FILE
|
||||
do
|
||||
echo "${FILE} is not own by current user, fixing..."
|
||||
chown $PUID:$PGID ${FILE}
|
||||
done
|
||||
done
|
||||
|
||||
echo Setting homarr UID to $PUID and GID to $PGID please wait...
|
||||
usermod -u $PUID homarr
|
||||
groupmod -g $PGID homarr
|
||||
|
||||
DOCKER_GID=$(stat -c %g /var/run/docker.sock 2>/dev/null)
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo "SETTING DOCKER GID TO ${DOCKER_GID}"
|
||||
groupmod -g $DOCKER_GID docker
|
||||
fi
|
||||
68
docker/entrypoint/entrypoint.sh
Executable file
68
docker/entrypoint/entrypoint.sh
Executable file
@@ -0,0 +1,68 @@
|
||||
#!/bin/sh
|
||||
# vim:sw=4:ts=4:et
|
||||
|
||||
set -e
|
||||
echo "Entering entrypoint..."
|
||||
|
||||
echo "Param \$1: $1"
|
||||
echo "User: "$(whoami)
|
||||
|
||||
|
||||
entrypoint_log() {
|
||||
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
|
||||
echo "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then
|
||||
entrypoint_log "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration"
|
||||
|
||||
entrypoint_log "$0: Looking for shell scripts in /docker-entrypoint.d/"
|
||||
find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
|
||||
case "$f" in
|
||||
*.envsh)
|
||||
if [ -x "$f" ]; then
|
||||
entrypoint_log "$0: Sourcing $f";
|
||||
. "$f"
|
||||
else
|
||||
# warn on shell scripts without exec bit
|
||||
entrypoint_log "$0: Ignoring $f, not executable";
|
||||
fi
|
||||
;;
|
||||
*.sh)
|
||||
if [ -x "$f" ]; then
|
||||
entrypoint_log "$0: Launching $f";
|
||||
"$f"
|
||||
else
|
||||
# warn on shell scripts without exec bit
|
||||
entrypoint_log "$0: Ignoring $f, not executable";
|
||||
fi
|
||||
;;
|
||||
*) entrypoint_log "$0: Ignoring $f";;
|
||||
esac
|
||||
done
|
||||
|
||||
entrypoint_log "$0: Configuration complete; ready for start up"
|
||||
else
|
||||
entrypoint_log "$0: No files found in /docker-entrypoint.d/, skipping configuration"
|
||||
fi
|
||||
|
||||
#exec "$@"
|
||||
|
||||
# sys container init:
|
||||
#
|
||||
# If no command is passed to the container, supervisord becomes init and
|
||||
# starts all its configured programs (per /etc/supervisord.conf).
|
||||
#
|
||||
# If a command is passed to the container, it runs in the foreground;
|
||||
# supervisord runs in the background and starts all its configured
|
||||
# programs.
|
||||
#
|
||||
# In either case, supervisord always starts its configured programs.
|
||||
|
||||
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
|
||||
exec supervisord -n "$@"
|
||||
else
|
||||
supervisord -c /etc/supervisord.conf &
|
||||
exec "$@"
|
||||
fi
|
||||
13
docker/etc/supervisor/conf.d/homarr.ini
Normal file
13
docker/etc/supervisor/conf.d/homarr.ini
Normal file
@@ -0,0 +1,13 @@
|
||||
[program:homarr]
|
||||
command=/app/scripts/run.sh
|
||||
environment=HOME="/app",USER="homarr",LOGNAME="homarr"
|
||||
user=homarr
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
autorestart=true
|
||||
startretries=0
|
||||
stopasgroup=true
|
||||
killasgroup=true
|
||||
stopsignal=KILL
|
||||
185
docker/etc/supervisord.conf
Normal file
185
docker/etc/supervisord.conf
Normal file
@@ -0,0 +1,185 @@
|
||||
; Sample supervisor config file.
|
||||
;
|
||||
; For more information on the config file, please see:
|
||||
; http://supervisord.org/configuration.html
|
||||
;
|
||||
; Notes:
|
||||
; - Shell expansion ("~" or "$HOME") is not supported. Environment
|
||||
; variables can be expanded using this syntax: "%(ENV_HOME)s".
|
||||
; - Quotes around values are not supported, except in the case of
|
||||
; the environment= options as shown below.
|
||||
; - Comments must have a leading space: "a=b ;comment" not "a=b;comment".
|
||||
; - Command will be truncated if it looks like a config file comment, e.g.
|
||||
; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ".
|
||||
;
|
||||
; Warning:
|
||||
; Paths throughout this example file use /tmp because it is available on most
|
||||
; systems. You will likely need to change these to locations more appropriate
|
||||
; for your system. Some systems periodically delete older files in /tmp.
|
||||
; Notably, if the socket file defined in the [unix_http_server] section below
|
||||
; is deleted, supervisorctl will be unable to connect to supervisord.
|
||||
|
||||
[unix_http_server]
|
||||
file=/run/supervisord.sock ; the path to the socket file
|
||||
;chmod=0700 ; socket file mode (default 0700)
|
||||
;chown=nobody:nogroup ; socket file uid:gid owner
|
||||
;username=user ; default is no username (open server)
|
||||
;password=123 ; default is no password (open server)
|
||||
|
||||
; Security Warning:
|
||||
; The inet HTTP server is not enabled by default. The inet HTTP server is
|
||||
; enabled by uncommenting the [inet_http_server] section below. The inet
|
||||
; HTTP server is intended for use within a trusted environment only. It
|
||||
; should only be bound to localhost or only accessible from within an
|
||||
; isolated, trusted network. The inet HTTP server does not support any
|
||||
; form of encryption. The inet HTTP server does not use authentication
|
||||
; by default (see the username= and password= options to add authentication).
|
||||
; Never expose the inet HTTP server to the public internet.
|
||||
|
||||
;[inet_http_server] ; inet (TCP) server disabled by default
|
||||
;port=127.0.0.1:9001 ; ip_address:port specifier, *:port for all iface
|
||||
;username=user ; default is no username (open server)
|
||||
;password=123 ; default is no password (open server)
|
||||
|
||||
[supervisord]
|
||||
#logfile=/var/log/supervisord.log ; main log file; default $CWD/supervisord.log
|
||||
logfile=/dev/null
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
;logfile_maxbytes=50MB ; max main logfile bytes b4 rotation; default 50MB
|
||||
;logfile_backups=10 ; # of main logfile backups; 0 means none, default 10
|
||||
;loglevel=info ; log level; default info; others: debug,warn,trace
|
||||
;pidfile=/run/supervisord.pid ; supervisord pidfile; default supervisord.pid
|
||||
;nodaemon=false ; start in foreground if true; default false
|
||||
nodaemon=true
|
||||
;silent=false ; no logs to stdout if true; default false
|
||||
;minfds=1024 ; min. avail startup file descriptors; default 1024
|
||||
;minprocs=200 ; min. avail process descriptors;default 200
|
||||
;umask=022 ; process file creation umask; default 022
|
||||
;user=chrism ; setuid to this UNIX account at startup; recommended if root
|
||||
;identifier=supervisor ; supervisord identifier, default is 'supervisor'
|
||||
;directory=/tmp ; default is not to cd during start
|
||||
;nocleanup=true ; don't clean up tempfiles at start; default false
|
||||
;childlogdir=/var/log/supervisor ; 'AUTO' child log dir, default $TEMP
|
||||
;environment=KEY="value" ; key value pairs to add to environment
|
||||
;strip_ansi=false ; strip ansi escape codes in logs; def. false
|
||||
|
||||
#logfile=/dev/null
|
||||
#logfile_maxbytes=0
|
||||
|
||||
#[eventlistener:stdout]
|
||||
#command = /app/.local/bin/supervisor_stdout
|
||||
#buffer_size = 1
|
||||
#events = PROCESS_LOG
|
||||
#result_handler = supervisor_stdout:event_handler
|
||||
|
||||
; The rpcinterface:supervisor section must remain in the config file for
|
||||
; RPC (supervisorctl/web interface) to work. Additional interfaces may be
|
||||
; added by defining them in separate [rpcinterface:x] sections.
|
||||
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
; The supervisorctl section configures how supervisorctl will connect to
|
||||
; supervisord. configure it match the settings in either the unix_http_server
|
||||
; or inet_http_server section.
|
||||
|
||||
[supervisorctl]
|
||||
serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket
|
||||
;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
|
||||
;username=chris ; should be same as in [*_http_server] if set
|
||||
;password=123 ; should be same as in [*_http_server] if set
|
||||
;prompt=mysupervisor ; cmd line prompt (default "supervisor")
|
||||
;history_file=~/.sc_history ; use readline history if available
|
||||
|
||||
; The sample program section below shows all possible program subsection values.
|
||||
; Create one or more 'real' program: sections to be able to control them under
|
||||
; supervisor.
|
||||
|
||||
;[program:theprogramname]
|
||||
;command=/bin/cat ; the program (relative uses PATH, can take args)
|
||||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
|
||||
;numprocs=1 ; number of processes copies to start (def 1)
|
||||
;directory=/tmp ; directory to cwd to before exec (def no cwd)
|
||||
;umask=022 ; umask for process (default None)
|
||||
;priority=999 ; the relative start priority (default 999)
|
||||
;autostart=true ; start at supervisord start (default: true)
|
||||
;startsecs=1 ; # of secs prog must stay up to be running (def. 1)
|
||||
;startretries=3 ; max # of serial start failures when starting (default 3)
|
||||
;autorestart=unexpected ; when to restart if exited after running (def: unexpected)
|
||||
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
|
||||
;stopsignal=QUIT ; signal used to kill process (default TERM)
|
||||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10)
|
||||
;stopasgroup=false ; send stop signal to the UNIX process group (default false)
|
||||
;killasgroup=false ; SIGKILL the UNIX process group (def false)
|
||||
;user=chrism ; setuid to this UNIX account to run the program
|
||||
;redirect_stderr=true ; redirect proc stderr to stdout (default false)
|
||||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO
|
||||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
|
||||
;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
|
||||
;stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
|
||||
;stdout_events_enabled=false ; emit events on stdout writes (default false)
|
||||
;stdout_syslog=false ; send stdout to syslog with process name (default false)
|
||||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO
|
||||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
|
||||
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
|
||||
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
|
||||
;stderr_events_enabled=false ; emit events on stderr writes (default false)
|
||||
;stderr_syslog=false ; send stderr to syslog with process name (default false)
|
||||
;environment=A="1",B="2" ; process environment additions (def no adds)
|
||||
;serverurl=AUTO ; override serverurl computation (childutils)
|
||||
|
||||
; The sample eventlistener section below shows all possible eventlistener
|
||||
; subsection values. Create one or more 'real' eventlistener: sections to be
|
||||
; able to handle event notifications sent by supervisord.
|
||||
|
||||
;[eventlistener:theeventlistenername]
|
||||
;command=/bin/eventlistener ; the program (relative uses PATH, can take args)
|
||||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
|
||||
;numprocs=1 ; number of processes copies to start (def 1)
|
||||
;events=EVENT ; event notif. types to subscribe to (req'd)
|
||||
;buffer_size=10 ; event buffer queue size (default 10)
|
||||
;directory=/tmp ; directory to cwd to before exec (def no cwd)
|
||||
;umask=022 ; umask for process (default None)
|
||||
;priority=-1 ; the relative start priority (default -1)
|
||||
;autostart=true ; start at supervisord start (default: true)
|
||||
;startsecs=1 ; # of secs prog must stay up to be running (def. 1)
|
||||
;startretries=3 ; max # of serial start failures when starting (default 3)
|
||||
;autorestart=unexpected ; autorestart if exited after running (def: unexpected)
|
||||
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
|
||||
;stopsignal=QUIT ; signal used to kill process (default TERM)
|
||||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10)
|
||||
;stopasgroup=false ; send stop signal to the UNIX process group (default false)
|
||||
;killasgroup=false ; SIGKILL the UNIX process group (def false)
|
||||
;user=chrism ; setuid to this UNIX account to run the program
|
||||
;redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners
|
||||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO
|
||||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
|
||||
;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
|
||||
;stdout_events_enabled=false ; emit events on stdout writes (default false)
|
||||
;stdout_syslog=false ; send stdout to syslog with process name (default false)
|
||||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO
|
||||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
|
||||
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
|
||||
;stderr_events_enabled=false ; emit events on stderr writes (default false)
|
||||
;stderr_syslog=false ; send stderr to syslog with process name (default false)
|
||||
;environment=A="1",B="2" ; process environment additions
|
||||
;serverurl=AUTO ; override serverurl computation (childutils)
|
||||
|
||||
; The sample group section below shows all possible group values. Create one
|
||||
; or more 'real' group: sections to create "heterogeneous" process groups.
|
||||
|
||||
;[group:thegroupname]
|
||||
;programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions
|
||||
;priority=999 ; the relative start priority (default 999)
|
||||
|
||||
; The [include] section can just contain the "files" setting. This
|
||||
; setting can list multiple files (separated by whitespace or
|
||||
; newlines). It can also contain wildcards. The filenames are
|
||||
; interpreted as relative to this file. Included files *cannot*
|
||||
; include files themselves.
|
||||
|
||||
|
||||
|
||||
[include]
|
||||
files = /etc/supervisor/conf.d/*.ini
|
||||
Reference in New Issue
Block a user