summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2022-02-01 22:46:45 +0000
committerGitHub <noreply@github.com>2022-02-01 17:46:45 -0500
commit73b68015de4d015f434c99ccaca49717bd164d3e (patch)
treecb4f787d5a88d815057ee96ec5fda08b57934f68 /docker
parente4919e414f958b21ddababd1f27d0f21f361d645 (diff)
downloadgitea-73b68015de4d015f434c99ccaca49717bd164d3e.tar.gz
gitea-73b68015de4d015f434c99ccaca49717bd164d3e.zip
In docker rootless use $GITEA_APP_INI if provided (#18524) (#18535)
Currently when calling `gitea` from any shell in rootless docker image it won't respect my `$GITEA_APP_INI`. Which this change it will use that value when defined instead of the default value. - https://discourse.gitea.io/t/gitea-1-16-0-unable-to-find-configuration-file/4543 - https://gitea.com/gitea/helm-chart/issues/287 Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'docker')
-rw-r--r--docker/rootless/usr/local/bin/gitea2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/rootless/usr/local/bin/gitea b/docker/rootless/usr/local/bin/gitea
index 5fdadfb3fe..1b33ca8547 100644
--- a/docker/rootless/usr/local/bin/gitea
+++ b/docker/rootless/usr/local/bin/gitea
@@ -32,7 +32,7 @@ for i in "$@"; do
done
if [ -z "$APP_INI_SET" ]; then
- CONF_ARG="-c \"$APP_INI\""
+ CONF_ARG="-c \"${GITEA_APP_INI:-$APP_INI}\""
fi