cerc-io/gitea
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[docker] support for custom GITEA_CUSTOM env var (#6608)

Browse Source
This commit is contained in:
Jakob Ackermann 2019-05-14 00:19:38 +02:00 committed by techknowlogick
parent 597ac064c3
commit 36b68fdb01
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/root/etc/profile.d/gitea.sh
View File

@ -1,2 +0,0 @@
#!/bin/bash
export GITEA_CUSTOM=/data/gitea

14
docker/root/etc/s6/gitea/setup
View File

@ -6,12 +6,16 @@ if [ ! -d /data/git/.ssh ]; then
fi fi
if [ ! -f /data/git/.ssh/environment ]; then if [ ! -f /data/git/.ssh/environment ]; then
echo "GITEA_CUSTOM=/data/gitea" >| /data/git/.ssh/environment echo "GITEA_CUSTOM=$GITEA_CUSTOM" >| /data/git/.ssh/environment
chmod 600 /data/git/.ssh/environment chmod 600 /data/git/.ssh/environment
elif ! grep -q "^GITEA_CUSTOM=$GITEA_CUSTOM$" /data/git/.ssh/environment; then
sed -i /^GITEA_CUSTOM=/d /data/git/.ssh/environment
echo "GITEA_CUSTOM=$GITEA_CUSTOM" >> /data/git/.ssh/environment
fi fi
if [ ! -f /data/gitea/conf/app.ini ]; then if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
mkdir -p /data/gitea/conf mkdir -p ${GITEA_CUSTOM}/conf
# Set INSTALL_LOCK to true only if SECRET_KEY is not empty and # Set INSTALL_LOCK to true only if SECRET_KEY is not empty and
# INSTALL_LOCK is empty # INSTALL_LOCK is empty
@ -36,7 +40,9 @@ if [ ! -f /data/gitea/conf/app.ini ]; then
DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \ DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \
REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \ REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \
SECRET_KEY=${SECRET_KEY:-""} \ SECRET_KEY=${SECRET_KEY:-""} \
envsubst < /etc/templates/app.ini > /data/gitea/conf/app.ini envsubst < /etc/templates/app.ini > ${GITEA_CUSTOM}/conf/app.ini
chown ${USER}:git ${GITEA_CUSTOM}/conf/app.ini
fi fi
# only chown if current owner is not already the gitea ${USER}. No recursive check to save time # only chown if current owner is not already the gitea ${USER}. No recursive check to save time