mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
fix: chatwoot ENV
This commit is contained in:
@@ -19,7 +19,7 @@ services:
|
|||||||
- POSTGRES_USER=postgres
|
- POSTGRES_USER=postgres
|
||||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
test: ["CMD-SHELL", "pg_isready -U postgres -h localhost -d chatwoot_production"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
@@ -58,9 +58,9 @@ services:
|
|||||||
- RAILS_LOG_TO_STDOUT=true
|
- RAILS_LOG_TO_STDOUT=true
|
||||||
command: >
|
command: >
|
||||||
sh -c "
|
sh -c "
|
||||||
until PGPASSWORD=${POSTGRES_PASSWORD} psql -h postgres -U postgres -d chatwoot_production -c '\q'; do
|
echo 'Waiting for postgres...'
|
||||||
echo 'Waiting for postgres...'
|
while ! PGPASSWORD='${POSTGRES_PASSWORD}' psql -h postgres -U postgres -d chatwoot_production -c 'SELECT 1' > /dev/null 2>&1; do
|
||||||
sleep 5
|
sleep 1
|
||||||
done
|
done
|
||||||
echo 'PostgreSQL is ready!'
|
echo 'PostgreSQL is ready!'
|
||||||
bundle exec rails db:chatwoot_prepare
|
bundle exec rails db:chatwoot_prepare
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ import {
|
|||||||
type DomainSchema,
|
type DomainSchema,
|
||||||
type Schema,
|
type Schema,
|
||||||
type Template,
|
type Template,
|
||||||
generatePassword,
|
|
||||||
generateRandomDomain,
|
|
||||||
generateBase64,
|
generateBase64,
|
||||||
|
generateRandomDomain,
|
||||||
|
generatePassword,
|
||||||
} from "../utils";
|
} from "../utils";
|
||||||
|
|
||||||
export function generate(schema: Schema): Template {
|
export function generate(schema: Schema): Template {
|
||||||
@@ -22,17 +22,10 @@ export function generate(schema: Schema): Template {
|
|||||||
];
|
];
|
||||||
|
|
||||||
const envs = [
|
const envs = [
|
||||||
`POSTGRES_USERNAME=postgres`,
|
|
||||||
`POSTGRES_USER=postgres`,
|
|
||||||
`POSTGRES_PASSWORD=${postgresPassword}`,
|
|
||||||
`POSTGRES_DB=chatwoot_production`,
|
|
||||||
`REDIS_PASSWORD=${redisPassword}`,
|
|
||||||
`CHATWOOT_HOST=${mainDomain}`,
|
`CHATWOOT_HOST=${mainDomain}`,
|
||||||
|
`POSTGRES_PASSWORD=${postgresPassword}`,
|
||||||
|
`REDIS_PASSWORD=${redisPassword}`,
|
||||||
`SECRET_KEY_BASE=${secretKeyBase}`,
|
`SECRET_KEY_BASE=${secretKeyBase}`,
|
||||||
`SMTP_ADDRESS=`,
|
|
||||||
`SMTP_PORT=587`,
|
|
||||||
`SMTP_USERNAME=`,
|
|
||||||
`SMTP_PASSWORD=`,
|
|
||||||
];
|
];
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user