Compare commits
2 Commits
5262e73a12
...
fcbd082f6d
| Author | SHA1 | Date | |
|---|---|---|---|
| fcbd082f6d | |||
| 183636bceb |
@ -3,30 +3,47 @@ import path from 'path';
|
||||
export default ({ env }) => {
|
||||
const client = env('DATABASE_CLIENT', 'sqlite');
|
||||
|
||||
console.log('=== DATABASE CONFIGURATION ===');
|
||||
console.log('DATABASE_CLIENT:', client);
|
||||
console.log('DATABASE_HOST:', env('DATABASE_HOST', 'not-set'));
|
||||
console.log('DATABASE_PORT:', env('DATABASE_PORT', 'not-set'));
|
||||
console.log('DATABASE_USERNAME:', env('DATABASE_USERNAME', 'not-set'));
|
||||
console.log('DATABASE_NAME:', env('DATABASE_NAME', 'not-set'));
|
||||
console.log('DATABASE_PASSWORD:', env('DATABASE_PASSWORD') ? '***SET***' : '***NOT SET***');
|
||||
console.log('DATABASE_SSL:', env('DATABASE_SSL', 'not-set'));
|
||||
|
||||
if (client === 'postgres') {
|
||||
return {
|
||||
const config = {
|
||||
connection: {
|
||||
client: 'postgres',
|
||||
host: env('DATABASE_HOST', 'localhost'),
|
||||
port: env.int('DATABASE_PORT', 5432),
|
||||
database: env('DATABASE_NAME', 'strapi'),
|
||||
user: env('DATABASE_USERNAME', 'strapi'),
|
||||
password: env('DATABASE_PASSWORD', 'strapi'),
|
||||
ssl: env.bool('DATABASE_SSL', false),
|
||||
pool: { min: 2, max: 10 },
|
||||
connection: {
|
||||
host: env('DATABASE_HOST', 'localhost'),
|
||||
port: env.int('DATABASE_PORT', 5432),
|
||||
database: env('DATABASE_NAME', 'strapi'),
|
||||
user: env('DATABASE_USERNAME', 'strapi'),
|
||||
password: env('DATABASE_PASSWORD', 'strapi'),
|
||||
ssl: env.bool('DATABASE_SSL', false),
|
||||
},
|
||||
pool: {
|
||||
min: env.int('DATABASE_POOL_MIN', 2),
|
||||
max: env.int('DATABASE_POOL_MAX', 10),
|
||||
},
|
||||
acquireConnectionTimeout: env.int('DATABASE_TIMEOUT', 60000),
|
||||
debug: env.bool('DATABASE_DEBUG', false),
|
||||
},
|
||||
};
|
||||
|
||||
console.log('Using PostgreSQL configuration');
|
||||
return config;
|
||||
}
|
||||
|
||||
console.log('Using SQLite configuration');
|
||||
return {
|
||||
connection: {
|
||||
client: 'sqlite',
|
||||
filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
|
||||
connection: {
|
||||
filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
|
||||
},
|
||||
useNullAsDefault: true,
|
||||
},
|
||||
};
|
||||
|
||||
@ -22,8 +22,10 @@ services:
|
||||
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
||||
volumes:
|
||||
- placebo-postgres-backend-data:/var/lib/postgresql/data
|
||||
expose:
|
||||
- "5432"
|
||||
healthcheck:
|
||||
test: ['CMD-SHELL', 'pg_isready']
|
||||
test: ['CMD-SHELL', 'pg_isready -U placebo_user -d placebo_backend_db']
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
@ -41,8 +43,10 @@ services:
|
||||
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
||||
volumes:
|
||||
- placebo-postgres-cms-data:/var/lib/postgresql/data
|
||||
expose:
|
||||
- "5432"
|
||||
healthcheck:
|
||||
test: ['CMD-SHELL', 'pg_isready']
|
||||
test: ['CMD-SHELL', 'pg_isready -U placebo_user -d placebo_cms_db']
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
Loading…
Reference in New Issue
Block a user