Skip to content

Commit 0cd82a5

Browse files
committed
Support custom sqlite path, add APP_KEY to readme
1 parent eb57eed commit 0cd82a5

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ param_ports:
3030

3131
opt_param_usage_include_env: true
3232
opt_param_env_vars:
33+
- { env_var: "APP_KEY", env_value: "", desc: "App key used for encrypting stored data. Generate with `docker exec speedtest-tracker php /app/www/artisan key:generate --show`" }
3334
- { env_var: "DB_HOST", env_value: "", desc: "Database hostname (postgres/mysql)." }
3435
- { env_var: "DB_PORT", env_value: "", desc: "Database port (postgres/mysql)." }
3536
- { env_var: "DB_DATABASE", env_value: "", desc: "Database name (postgres/mysql)." }

root/etc/s6-overlay/s6-rc.d/init-speedtest-tracker-config/run

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@ lsiown abc:abc \
55
/config
66

77
if [[ "${DB_CONNECTION:=sqlite}" = "sqlite" ]]; then
8-
touch /config/database.sqlite
9-
if [[ -e "/app/www/database/database.sqlite" && ! -L "/app/www/database/database.sqlite" ]]; then
10-
rm -rf "/app/www/database/database.sqlite"
11-
fi
12-
if [[ ! -L "/app/www/database/database.sqlite" ]]; then
13-
ln -s "/config/database.sqlite" "/app/www/database/database.sqlite"
8+
if [[ -n "${DB_DATABASE}" ]]; then
9+
if [[ ! -e "${DB_DATABASE}" ]]; then
10+
touch "${DB_DATABASE}"
11+
lsiown abc:abc "${DB_DATABASE}"
12+
fi
13+
else
14+
touch /config/database.sqlite
15+
if [[ -e "/app/www/database/database.sqlite" && ! -L "/app/www/database/database.sqlite" ]]; then
16+
rm -rf "/app/www/database/database.sqlite"
17+
fi
18+
if [[ ! -L "/app/www/database/database.sqlite" ]]; then
19+
ln -s "/config/database.sqlite" "/app/www/database/database.sqlite"
20+
fi
21+
lsiown abc:abc /app/www/database/database.sqlite
1422
fi
1523
elif [[ "${DB_CONNECTION}" = "mysql" ]]; then
1624
echo "Waiting for DB to be available"
@@ -50,8 +58,7 @@ fi
5058

5159
lsiown -R abc:abc \
5260
/app/www/bootstrap/cache \
53-
/app/www/storage \
54-
/app/www/database
61+
/app/www/storage
5562

5663
# Check for env file
5764
if [[ ! -f /config/.env ]]; then

0 commit comments

Comments
 (0)