Skip to content

Commit c7c0a12

Browse files
committed
Added CLI_USER support, Fixed cli script usage
1 parent a51ed84 commit c7c0a12

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

docker-env.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ PHP_TIMEZONE=UTC
4040
PHP_UID=1000
4141
PHP_GID=1000
4242

43+
# Default cli user (should be www-data)
44+
CLI_USER=www-data

docker/main/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ case "$1" in
4848
cli)
4949
if [ -n "${CLI_SCRIPT}" ]; then
5050
shift
51-
exec ${CLI_SCRIPT} "$@"
51+
exec sudo -E -u "${CLI_USER}" ${CLI_SCRIPT} "$@"
5252
else
5353
echo "[ERROR] No CLI_SCRIPT in docker-env.yml defined"
5454
exit 1
@@ -60,6 +60,6 @@ case "$1" in
6060
## Set home dir (workaround)
6161
export HOME=/home/
6262
## Execute cmd
63-
sudo -E -u www-data "$@"
63+
exec sudo -E -u "${CLI_USER}" "$@"
6464
;;
6565
esac

0 commit comments

Comments
 (0)