dimitar/placebo.mk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

messing up deployment

Browse Source
This commit is contained in:
echo 2026-02-24 13:49:03 +01:00
parent a9528582fd
commit 831da0af4d
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cms/cms/Dockerfile
View File

@ -36,9 +36,12 @@ COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
COPY --from=builder --chown=nodejs:nodejs /app/package*.json ./ COPY --from=builder --chown=nodejs:nodejs /app/package*.json ./
COPY --from=builder --chown=nodejs:nodejs /app/dist/config ./config COPY --from=builder --chown=nodejs:nodejs /app/dist/config ./config
# Create data directory # Also copy .env file if exists (for defaults)
RUN mkdir -p /app/.tmp && \ COPY --from=builder --chown=nodejs:nodejs /app/.env ./
chown -R nodejs:nodejs /app/.tmp
# Create data and database directories with proper permissions
RUN mkdir -p /app/.tmp /app/database /app/uploads /app/database/migrations && \
chown -R nodejs:nodejs /app
# Switch to non-root user # Switch to non-root user
USER nodejs USER nodejs

36
cms/cms/config/database.ts
View File

@ -3,19 +3,12 @@ import path from 'path';
export default ({ env }) => { export default ({ env }) => {
const client = env('DATABASE_CLIENT', 'sqlite'); const client = env('DATABASE_CLIENT', 'sqlite');
if (client === 'postgres') { console.log('DATABASE_CLIENT:', client);
const connectionString = env('DATABASE_URL'); console.log('DATABASE_HOST:', env('DATABASE_HOST', 'not-set'));
console.log('DATABASE_USERNAME:', env('DATABASE_USERNAME', 'not-set'));
if (connectionString) { console.log('DATABASE_NAME:', env('DATABASE_NAME', 'not-set'));
return {
connection: {
client,
connection: connectionString,
pool: { min: env.int('DATABASE_POOL_MIN', 2), max: env.int('DATABASE_POOL_MAX', 10) },
},
};
}
if (client === 'postgres') {
return { return {
connection: { connection: {
client, client,
@ -27,24 +20,7 @@ export default ({ env }) => {
password: env('DATABASE_PASSWORD', 'strapi'), password: env('DATABASE_PASSWORD', 'strapi'),
ssl: env.bool('DATABASE_SSL', false), ssl: env.bool('DATABASE_SSL', false),
}, },
pool: { min: env.int('DATABASE_POOL_MIN', 2), max: env.int('DATABASE_POOL_MAX', 10) }, pool: { min: 2, max: 10 },
},
};
}
if (client === 'mysql') {
return {
connection: {
client,
connection: {
host: env('DATABASE_HOST', 'localhost'),
port: env.int('DATABASE_PORT', 3306),
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) },
}, },
}; };
} }