diff --git a/docker-compose.yml b/docker-compose.yml index d62a57b..fc69eac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,12 @@ services: - VIRTUAL_PORT=1337 - LETSENCRYPT_HOST=${LETSENCRYPT_HOST:-} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-} + - DB_HOST=f0ckm-db + - DB_PORT=5432 + - DB_USER=${POSTGRES_USER:-f0ckm} + - DB_PASS=${POSTGRES_PASSWORD:-f0ckm} + - DB_NAME=${POSTGRES_DB:-f0ckm} + - NODE_ENV=production ports: - "1337:1337" restart: unless-stopped diff --git a/src/inc/config.mjs b/src/inc/config.mjs index 0284ba3..cfd8e7e 100644 --- a/src/inc/config.mjs +++ b/src/inc/config.mjs @@ -12,7 +12,8 @@ config.sql.user = process.env.DB_USER || process.env.POSTGRES_USER || process.en config.sql.password = process.env.DB_PASS || process.env.POSTGRES_PASSWORD || process.env.PGPASSWORD || config.sql.password; config.sql.database = process.env.DB_NAME || process.env.POSTGRES_DB || process.env.PGDATABASE || config.sql.database; -if (process.env.NODE_ENV === 'production') { +const isDocker = process.env.DB_HOST === 'f0ckm-db' || config.sql.host === 'f0ckm-db' || process.env.CONTAINER === 'true'; +if (process.env.NODE_ENV === 'production' || isDocker) { config.main.development = false; } @@ -65,7 +66,7 @@ config.paths = { koepfe: resolvePath('public/s/koepfe'), fonts: resolvePath('public/s/fonts'), memes: resolvePath('public/memes'), - e: resolvePath('e'), + e: resolvePath('public/e'), pending: resolvePath('pending'), deleted: resolvePath('deleted'), logs: resolvePath('logs'),