mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
fix: More Config Fixes
This commit is contained in:
@@ -12,14 +12,16 @@ services:
|
||||
redis:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- AP_DB_TYPE=POSTGRES
|
||||
- AP_POSTGRES_DATABASE=${AP_POSTGRES_DATABASE}
|
||||
- AP_POSTGRES_PASSWORD=${AP_POSTGRES_PASSWORD}
|
||||
- AP_POSTGRES_USERNAME=${AP_POSTGRES_USERNAME}
|
||||
- AP_POSTGRES_HOST=postgres
|
||||
- AP_POSTGRES_PORT=5432
|
||||
- AP_QUEUE_MODE=REDIS
|
||||
- AP_REDIS_HOST=redis
|
||||
- AP_REDIS_PORT=6379
|
||||
- AP_REDIS_URL=redis://:${REDIS_PASSWORD}@redis:6379
|
||||
- AP_REDIS_PASSWORD=${REDIS_PASSWORD}
|
||||
- AP_ENVIRONMENT=prod
|
||||
- AP_FRONTEND_URL=https://${AP_HOST}
|
||||
- AP_ENCRYPTION_KEY=${AP_ENCRYPTION_KEY}
|
||||
@@ -30,7 +32,7 @@ services:
|
||||
- AP_TRIGGER_DEFAULT_POLL_INTERVAL=5
|
||||
- AP_FLOW_TIMEOUT_SECONDS=600
|
||||
- AP_TELEMETRY_ENABLED=true
|
||||
- AP_TEMPLATES_SOURCE_URL="https://cloud.activepieces.com/api/v1/flow-templates"
|
||||
- AP_TEMPLATES_SOURCE_URL=https://cloud.activepieces.com/api/v1/flow-templates
|
||||
|
||||
postgres:
|
||||
image: postgres:14.4
|
||||
|
||||
@@ -16,10 +16,10 @@ services:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
- POSTGRES_DB=chatwoot_production
|
||||
- POSTGRES_USER=${POSTGRES_USERNAME}
|
||||
- POSTGRES_USER=postgres
|
||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USERNAME}"]
|
||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
|
||||
export function generate(schema: Schema): Template {
|
||||
const mainDomain = generateRandomDomain(schema);
|
||||
const postgresUsername = "postgres";
|
||||
const postgresPassword = generatePassword();
|
||||
const redisPassword = generatePassword();
|
||||
const secretKeyBase = generateBase64(64);
|
||||
@@ -23,9 +22,10 @@ export function generate(schema: Schema): Template {
|
||||
];
|
||||
|
||||
const envs = [
|
||||
`POSTGRES_DB=chatwoot`,
|
||||
`POSTGRES_USER=${postgresUsername}`,
|
||||
`POSTGRES_USERNAME=postgres`,
|
||||
`POSTGRES_USER=postgres`,
|
||||
`POSTGRES_PASSWORD=${postgresPassword}`,
|
||||
`POSTGRES_DB=chatwoot_production`,
|
||||
`REDIS_PASSWORD=${redisPassword}`,
|
||||
`CHATWOOT_HOST=${mainDomain}`,
|
||||
`SECRET_KEY_BASE=${secretKeyBase}`,
|
||||
|
||||
@@ -93,7 +93,7 @@ services:
|
||||
networks:
|
||||
- dokploy-network
|
||||
volumes:
|
||||
- ../files/stacks:/etc/caddy
|
||||
- ../files/Caddyfile:/etc/caddy/Caddyfile
|
||||
environment:
|
||||
- BASE_URL=":80"
|
||||
depends_on:
|
||||
|
||||
@@ -26,7 +26,7 @@ export function generate(schema: Schema): Template {
|
||||
|
||||
const mounts: Template["mounts"] = [
|
||||
{
|
||||
filePath: "files/stacks/windmill/Caddyfile",
|
||||
filePath: "Caddyfile",
|
||||
content: `{$BASE_URL} {
|
||||
bind {$ADDRESS}
|
||||
reverse_proxy /ws/* http://lsp:3001
|
||||
|
||||
Reference in New Issue
Block a user