From 20a80894c3e2ec1ed004c999397865291384403c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 13 May 2018 11:13:32 -0400 Subject: [PATCH 1/4] If using a different $USER then rename git user --- docker/usr/bin/entrypoint | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/usr/bin/entrypoint b/docker/usr/bin/entrypoint index b374c5aed756b..9c10f400b4ba6 100755 --- a/docker/usr/bin/entrypoint +++ b/docker/usr/bin/entrypoint @@ -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 From a8dc67ca8347101118072f0d8fae1ca6190ecb13 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 13 May 2018 11:16:17 -0400 Subject: [PATCH 2/4] Chown based on $USER env --- docker/etc/s6/gitea/setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup index 8e6441c5c2c7f..6ca9b82123c3a 100755 --- a/docker/etc/s6/gitea/setup +++ b/docker/etc/s6/gitea/setup @@ -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 From c240ea8dda86f91966f71a1e35328c6cdbbaac1e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 14 May 2018 20:54:28 -0400 Subject: [PATCH 3/4] Target only one part of passwd --- docker/usr/bin/entrypoint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/usr/bin/entrypoint b/docker/usr/bin/entrypoint index 9c10f400b4ba6..50623bfa66060 100755 --- a/docker/usr/bin/entrypoint +++ b/docker/usr/bin/entrypoint @@ -2,7 +2,7 @@ if [ "${USER}" != "git" ]; then # rename user - sed -i -e "s/git\:/${USER}\:/g" /etc/passwd + 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 From b588fa3708cfb5140886f71f66c65019c6f44b71 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 15 May 2018 00:31:21 -0400 Subject: [PATCH 4/4] su-exec based on $USER not a hardcoded value --- docker/etc/s6/gitea/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/etc/s6/gitea/run b/docker/etc/s6/gitea/run index 1fddb93708a02..da5fd6b535ef6 100755 --- a/docker/etc/s6/gitea/run +++ b/docker/etc/s6/gitea/run @@ -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