diff options
| author | Adrian POIGET <poigetadrian@gmail.com> | 2020-05-04 11:50:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 10:50:29 +0100 |
| commit | 99082eebd76019fc608e44c4464da6398f51dccd (patch) | |
| tree | ec7018f2e8786fac3ee2ffa24ef2e2b8a7d64f81 /docker/root | |
| parent | 64029e1468d1c004262088ac7423fac0ba1124b7 (diff) | |
| download | gitea-99082eebd76019fc608e44c4464da6398f51dccd.tar.gz gitea-99082eebd76019fc608e44c4464da6398f51dccd.zip | |
Fix; declare DOMAIN variable for docker setup (#10780)
In the /install form, the value for SSH Server Domain is taken form the DOMAIN variable
and overwrites SSH_DOMAIN environment variable set the first time if nothing done
Co-authored-by: Adrian POIGET <adrian.poiget@viveris.fr>
Diffstat (limited to 'docker/root')
| -rwxr-xr-x | docker/root/etc/s6/gitea/setup | 1 | ||||
| -rw-r--r-- | docker/root/etc/templates/app.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/root/etc/s6/gitea/setup b/docker/root/etc/s6/gitea/setup index f87ce9115e..892fa7fd2b 100755 --- a/docker/root/etc/s6/gitea/setup +++ b/docker/root/etc/s6/gitea/setup @@ -26,6 +26,7 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then # Substitude the environment variables in the template APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \ RUN_MODE=${RUN_MODE:-"dev"} \ + DOMAIN=${DOMAIN:-"localhost"} \ SSH_DOMAIN=${SSH_DOMAIN:-"localhost"} \ HTTP_PORT=${HTTP_PORT:-"3000"} \ ROOT_URL=${ROOT_URL:-""} \ diff --git a/docker/root/etc/templates/app.ini b/docker/root/etc/templates/app.ini index e05c24a09b..9b23c1270d 100644 --- a/docker/root/etc/templates/app.ini +++ b/docker/root/etc/templates/app.ini @@ -12,6 +12,7 @@ TEMP_PATH = /data/gitea/uploads [server] APP_DATA_PATH = /data/gitea +DOMAIN = $DOMAIN SSH_DOMAIN = $SSH_DOMAIN HTTP_PORT = $HTTP_PORT ROOT_URL = $ROOT_URL |