From 065155c88560421f85e6adabfa12a47cc39f42ce Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Tue, 26 Sep 2023 13:58:25 +0800
Subject: [PATCH] gitea

---
 docker/git/Dockerfile        | 1 -
 docker/git/src/s6/user/run   | 2 +-
 docker/git/src/s6/user/setup | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/docker/git/Dockerfile b/docker/git/Dockerfile
index 04185974..f51d9521 100644
--- a/docker/git/Dockerfile
+++ b/docker/git/Dockerfile
@@ -3,5 +3,4 @@ FROM gitea/gitea:1.20.4
 LABEL maintainer="Websoft9<help@websoft9.com>"
 LABEL version="1.20.4"
 COPY ./src/s6/user /etc/s6/user
-
 RUN chmod -R 755 /etc/s6/user
\ No newline at end of file
diff --git a/docker/git/src/s6/user/run b/docker/git/src/s6/user/run
index 8a568558..86af1d7e 100644
--- a/docker/git/src/s6/user/run
+++ b/docker/git/src/s6/user/run
@@ -2,5 +2,5 @@
 
 [[ -f ./setup ]] && source ./setup
 pushd /root >/dev/null
-exec su-exec root /bin/echo ""
+exec s6-svc -D /etc/s6/user
 popd
\ No newline at end of file
diff --git a/docker/git/src/s6/user/setup b/docker/git/src/s6/user/setup
index c37561d8..e9bfb6f8 100644
--- a/docker/git/src/s6/user/setup
+++ b/docker/git/src/s6/user/setup
@@ -25,7 +25,6 @@ admin_email="help@websoft9.com"
 
 if [ -e "$cred_path" ]; then
   echo "File $cred_path exists. Exiting script."
-  s6-svc -D /etc/s6/user
   exit 0
 fi
 
@@ -47,4 +46,3 @@ password=$(grep -o "generated random password is '[^']*" /tmp/credential | sed "
 echo "Save to credential"
 json="{\"username\":\"$admin_username\",\"password\":\"$password\",\"email\":\"$admin_email\"}"
 echo "$json" > "$cred_path"
-s6-svc -D /etc/s6/user
\ No newline at end of file