From 763edd96f84f76f0a25612b137c594f4db37413c Mon Sep 17 00:00:00 2001
From: EndMove <superjeremi1302@gmail.com>
Date: Tue, 11 Oct 2022 22:43:22 +0200
Subject: [PATCH] Fixing : admin gid uid auto detection

---
 CONTROL/changelog.txt   | 4 ++++
 CONTROL/config.json     | 2 +-
 CONTROL/post-install.sh | 6 +++---
 CONTROL/start-stop.sh   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CONTROL/changelog.txt b/CONTROL/changelog.txt
index dd2a3bd..23d3bc8 100644
--- a/CONTROL/changelog.txt
+++ b/CONTROL/changelog.txt
@@ -1,3 +1,7 @@
+Version: 1.17.2.r02
+- Fix multi volume support by jonmseaman.
+- Fix admin gid, uid auto detection.
+
 Version: 1.17.2.r01
 - Update Gitea to 1.17.2, release notes (https://github.com/go-gitea/gitea/releases/tag/v1.17.2).
 - Update to docker 20.10.17.r1
diff --git a/CONTROL/config.json b/CONTROL/config.json
index eba9612..3ecfe91 100644
--- a/CONTROL/config.json
+++ b/CONTROL/config.json
@@ -2,7 +2,7 @@
   "general":{
     "package":"gitea-docker",
     "name":"Gitea",
-    "version":"1.17.2.r01",
+    "version":"1.17.2.r02",
     "depends":[
       "docker-ce(>=20.10.17.r1)"
     ],
diff --git a/CONTROL/post-install.sh b/CONTROL/post-install.sh
index 6c67128..c068589 100644
--- a/CONTROL/post-install.sh
+++ b/CONTROL/post-install.sh
@@ -6,9 +6,9 @@ echo "gitea-adm: --== post-install ==--"
 GITEA_VERSION=$(cat $APKG_PKG_DIR/gitea_version)
 GITEA_DATA_PATH='/share/Docker/Gitea'
 GITEA_CONFIG_PATH='/gitea/conf'
-GITEA_CONTAINER=Gitea
-GITEA_UID=999
-GITEA_GID=999
+GITEA_CONTAINER='Gitea'
+GITEA_UID=$(id -u 'admin')
+GITEA_GID=$(id -g 'admin')
 
 # Checking the configuration to install according to the user's settings
 if [ -d ${GITEA_DATA_PATH}${GITEA_CONFIG_PATH} ]; then
diff --git a/CONTROL/start-stop.sh b/CONTROL/start-stop.sh
index 2507d98..1333750 100644
--- a/CONTROL/start-stop.sh
+++ b/CONTROL/start-stop.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Environment variable
-GITEA_CONTAINER=Gitea
+GITEA_CONTAINER='Gitea'
 
 case "$1" in
   start)