summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorlinest <morlinest@gmail.com>2017-11-02 22:08:21 +0100
committerLauris BH <lauris@nix.lv>2017-11-02 23:08:21 +0200
commit529f9d03ce578555d87657265cb1b25d7b81ecf6 (patch)
tree3775d514cdd0638ab0d57acf16c25c3ee0e47a2b
parentf70758dec918b01f0895bb747decfdf110ae52bd (diff)
downloadgitea-529f9d03ce578555d87657265cb1b25d7b81ecf6.tar.gz
gitea-529f9d03ce578555d87657265cb1b25d7b81ecf6.zip
Fix ordering in app.ini and fix run mode option (#2829)
-rwxr-xr-xdocker/etc/s6/gitea/setup2
-rw-r--r--docker/etc/templates/app.ini5
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index 30884bc411..e6dd3ffa2b 100755
--- 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 0dcf41be14..2375f8f533 100644
--- 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]