Compare commits

..

No commits in common. "fcbd082f6d969fef1be7ca398734ba1560aa4588" and "5262e73a123864cfa0a5d01fd02c5ff2f46a1de4" have entirely different histories.

2 changed files with 11 additions and 32 deletions

View File

@ -3,47 +3,30 @@ import path from 'path';
export default ({ env }) => { export default ({ env }) => {
const client = env('DATABASE_CLIENT', 'sqlite'); const client = env('DATABASE_CLIENT', 'sqlite');
console.log('=== DATABASE CONFIGURATION ===');
console.log('DATABASE_CLIENT:', client); console.log('DATABASE_CLIENT:', client);
console.log('DATABASE_HOST:', env('DATABASE_HOST', 'not-set')); 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_USERNAME:', env('DATABASE_USERNAME', 'not-set'));
console.log('DATABASE_NAME:', env('DATABASE_NAME', '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') { if (client === 'postgres') {
const config = { return {
connection: { connection: {
client: 'postgres', client: 'postgres',
connection: { host: env('DATABASE_HOST', 'localhost'),
host: env('DATABASE_HOST', 'localhost'), port: env.int('DATABASE_PORT', 5432),
port: env.int('DATABASE_PORT', 5432), database: env('DATABASE_NAME', 'strapi'),
database: env('DATABASE_NAME', 'strapi'), user: env('DATABASE_USERNAME', 'strapi'),
user: env('DATABASE_USERNAME', 'strapi'), password: env('DATABASE_PASSWORD', 'strapi'),
password: env('DATABASE_PASSWORD', 'strapi'), ssl: env.bool('DATABASE_SSL', false),
ssl: env.bool('DATABASE_SSL', false), pool: { min: 2, max: 10 },
},
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 { return {
connection: { connection: {
client: 'sqlite', client: 'sqlite',
connection: { filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
},
useNullAsDefault: true, useNullAsDefault: true,
}, },
}; };

View File

@ -22,10 +22,8 @@ services:
POSTGRES_PASSWORD: ${DATABASE_PASSWORD} POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
volumes: volumes:
- placebo-postgres-backend-data:/var/lib/postgresql/data - placebo-postgres-backend-data:/var/lib/postgresql/data
expose:
- "5432"
healthcheck: healthcheck:
test: ['CMD-SHELL', 'pg_isready -U placebo_user -d placebo_backend_db'] test: ['CMD-SHELL', 'pg_isready']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
@ -43,10 +41,8 @@ services:
POSTGRES_PASSWORD: ${DATABASE_PASSWORD} POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
volumes: volumes:
- placebo-postgres-cms-data:/var/lib/postgresql/data - placebo-postgres-cms-data:/var/lib/postgresql/data
expose:
- "5432"
healthcheck: healthcheck:
test: ['CMD-SHELL', 'pg_isready -U placebo_user -d placebo_cms_db'] test: ['CMD-SHELL', 'pg_isready']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10