diff --git a/build/fpm/entrypoint/validate_laravel.sh b/build/fpm/entrypoint/validate_laravel.sh index dff1cb2409a92c9f624c8ce01d3787033e46bd29..55ee21b019e6230005e4a0facf21d608f6f55c07 100755 --- a/build/fpm/entrypoint/validate_laravel.sh +++ b/build/fpm/entrypoint/validate_laravel.sh @@ -12,8 +12,12 @@ if [ ! -f "$BASE_DIR/config/sumasEn.json" ]; then cp $BASE_DIR/config/sumas.json.example $BASE_DIR/config/sumasEn.json fi -if [ ! -f "$BASE_DIR/database/database.sqlite" ]; then - touch $BASE_DIR/database/database.sqlite +if [ ! -d "$BASE_DIR/database/databases/" ]; then + mkdir -p "$BASE_DIR/database/databases/" +fi + +if [ ! -f "$BASE_DIR/database/databases/database.sqlite" ]; then + touch "$BASE_DIR/database/databases/database.sqlite" fi if [ ! -d "$BASE_DIR/storage/logs/metager" ]; then diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 02d463dc1a95a9dd834d2f16e713352e8cb4c413..61de6a02edda910acff0e0c8e8233f84b9c2877e 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -37,6 +37,8 @@ spec: - name: redis-config configMap: name: {{ include "chart.fullname" . }}-redis-container-config + - name: sqlite-databases + emptyDir: {} containers: - name: fpm securityContext: @@ -80,6 +82,8 @@ spec: - name: mglogs-persistent-storage mountPath: /metager/metager_app/storage/logs/metager readOnly: false + - name: sqlite-databases + mountPath: /metager/metager_app/database/databases ports: - name: http containerPort: 8080 @@ -122,6 +126,8 @@ spec: - name: mglogs-persistent-storage mountPath: /metager/metager_app/storage/logs/metager readOnly: false + - name: sqlite-databases + mountPath: /metager/metager_app/database/databases ports: - name: http containerPort: 8080 diff --git a/metager/config/database.php b/metager/config/database.php index 7f63636daba267656743e2adb43c27846361170d..7f5302ac0a9f1acc10a1991cb0f6c0df3a801735 100644 --- a/metager/config/database.php +++ b/metager/config/database.php @@ -48,12 +48,12 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => database_path(env('SQLITE_DATABASE', 'database.sqlite')), + 'database' => database_path('databases/' . env('SQLITE_DATABASE', 'database.sqlite')), 'prefix' => '', ], 'useragents' => [ 'driver' => 'sqlite', - 'database' => database_path(env('SQLITE_DATABASE', 'database.sqlite')), + 'database' => database_path('databases/' . env('SQLITE_DATABASE', 'database.sqlite')), 'prefix' => '', ], 'mysql' => [