Skip to content

Commit

Permalink
Allow Gitea to run as different USER in Docker (#3961)
Browse files Browse the repository at this point in the history
* If using a different $USER then rename git user

* Chown based on $USER env

* Target only one part of passwd

* su-exec based on $USER

not a hardcoded value
  • Loading branch information
techknowlogick authored and lunny committed May 16, 2018
1 parent 4ceb92f commit ecfc401
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/etc/s6/gitea/run
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
[[ -f ./setup ]] && source ./setup

pushd /app/gitea > /dev/null
exec su-exec git /app/gitea/gitea web
exec su-exec $USER /app/gitea/gitea web
popd
2 changes: 1 addition & 1 deletion docker/etc/s6/gitea/setup
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ if [ ! -f /data/gitea/conf/app.ini ]; then
envsubst < /etc/templates/app.ini > /data/gitea/conf/app.ini
fi

chown -R git:git /data/gitea /app/gitea /data/git
chown -R ${USER}:git /data/gitea /app/gitea /data/git
chmod 0755 /data/gitea /app/gitea /data/git
7 changes: 7 additions & 0 deletions docker/usr/bin/entrypoint
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/sh

if [ "${USER}" != "git" ]; then
# rename user
sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd
# switch sshd config to different user
sed -i -e "s/AllowUsers git/AllowUsers ${USER}/g" /etc/ssh/sshd_config
fi

## Change GID for USER?
if [ -n "${USER_GID}" ] && [ "${USER_GID}" != "`id -g ${USER}`" ]; then
sed -i -e "s/^${USER}:\([^:]*\):[0-9]*/${USER}:\1:${USER_GID}/" /etc/group
Expand Down

0 comments on commit ecfc401

Please sign in to comment.