extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-05-30 23:06:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix DB_DATABASE path not respected by entrypoint script - Fixes #192

Browse Source
This commit is contained in:
Bubka 2024-03-23 18:54:19 +01:00
parent 2e296ba3c1
commit dd7d3d95df
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docker/entrypoint.sh vendored
View File

@ -9,12 +9,31 @@ echo "supervisord version: $(supervisord version)"
php-fpm81 -v | head -n 1 php-fpm81 -v | head -n 1
nginx -v nginx -v
# Database creation
if [ "${DB_CONNECTION}" = "sqlite" ]; then if [ "${DB_CONNECTION}" = "sqlite" ]; then
if [ ! -f /2fauth/database.sqlite ]; then # DB_DATABASE is trimmed if necessary
touch /2fauth/database.sqlite if [[ $DB_DATABASE == \"* ]] && [[ $DB_DATABASE == *\" ]] ; then
dbpath=${DB_DATABASE:1:${#DB_DATABASE}-2}
else
dbpath=${DB_DATABASE}
fi
if [ $dbpath != "/srv/database/database.sqlite" ]; then
echo "DB_DATABASE sets with custom path: ${dbpath}"
if [ ! -f ${dbpath} ]; then
echo "${dbpath} does not exist, we create it"
touch ${dbpath}
fi
else
echo "DB_DATABASE sets with default path, we will use a symlink"
echo "Actual db file will be /2fauth/database.sqlite"
if [ ! -f /2fauth/database.sqlite ]; then
echo "/2fauth/database.sqlite does not exist, we create it"
touch /2fauth/database.sqlite
fi
rm -f /srv/database/database.sqlite
ln -s /2fauth/database.sqlite /srv/database/database.sqlite
echo "/srv/database/database.sqlite is now a symlink to /2fauth/database.sqlite"
fi fi
rm -f /srv/database/database.sqlite
ln -s /2fauth/database.sqlite /srv/database/database.sqlite
fi fi
# Inject storage in /2fauth and use it with a symlink # Inject storage in /2fauth and use it with a symlink
@ -30,7 +49,8 @@ if [ -f /2fauth/installed ]; then
INSTALLED_COMMIT="$(cat /2fauth/installed)" INSTALLED_COMMIT="$(cat /2fauth/installed)"
if [ "${INSTALLED_COMMIT}" != "${COMMIT}" ]; then if [ "${INSTALLED_COMMIT}" != "${COMMIT}" ]; then
echo "Installed commit ${INSTALLED_COMMIT} is different from program commit ${COMMIT}, we are migrating..." echo "Installed commit ${INSTALLED_COMMIT} is different from program commit ${COMMIT}, we are migrating..."
php artisan optimize:clear php artisan cache:clear
php artisan config:clear
php artisan migrate --force php artisan migrate --force
fi fi
else else
@ -40,6 +60,7 @@ fi
echo "${COMMIT}" > /2fauth/installed echo "${COMMIT}" > /2fauth/installed
php artisan storage:link --quiet php artisan storage:link --quiet
php artisan optimize:clear
php artisan config:cache php artisan config:cache
php artisan route:cache php artisan route:cache
php artisan view:cache php artisan view:cache