Fix ordering in app.ini and fix run mode option (#2829)

diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index 30884bc4117156e1eea812985498a58e62fd19ed..e6dd3ffa2b55b5b53ddf600480353211bf23754e 100755 (executable)
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
@@ -21,7 +21,7 @@ if [ ! -f /data/gitea/conf/app.ini ]; then
 
     # Substitude the environment variables in the template
     APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
-    APP_MODE=${APP_MODE:-"dev"} \
+    RUN_MODE=${RUN_MODE:-"dev"} \
     SSH_DOMAIN=${SSH_DOMAIN:-"localhost"} \
     HTTP_PORT=${HTTP_PORT:-"3000"} \
     ROOT_URL=${ROOT_URL:-""} \

diff --git a/docker/etc/templates/app.ini b/docker/etc/templates/app.ini
index 0dcf41be1481e711276448e56350257f90786d65..2375f8f533a9a49b651422528e4572f395bf489f 100644 (file)
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
@@ -1,6 +1,7 @@
-[repository]
 APP_NAME = $APP_NAME
-APP_MODE = $APP_MODE
+RUN_MODE = $RUN_MODE
+
+[repository]
 ROOT = /data/git/repositories
 
 [repository.upload]