Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: More Config Fixes

Browse Source
This commit is contained in:
DrMxrcy
2024-11-13 05:21:07 -05:00
parent f1fc3f161a
commit 8157dd9eaa
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dokploy/templates/activepieces/docker-compose.yml
View File

@@ -12,14 +12,16 @@ services:
redis: redis:
condition: service_healthy condition: service_healthy
environment: environment:
- AP_DB_TYPE=POSTGRES
- AP_POSTGRES_DATABASE=${AP_POSTGRES_DATABASE} - AP_POSTGRES_DATABASE=${AP_POSTGRES_DATABASE}
- AP_POSTGRES_PASSWORD=${AP_POSTGRES_PASSWORD} - AP_POSTGRES_PASSWORD=${AP_POSTGRES_PASSWORD}
- AP_POSTGRES_USERNAME=${AP_POSTGRES_USERNAME} - AP_POSTGRES_USERNAME=${AP_POSTGRES_USERNAME}
- AP_POSTGRES_HOST=postgres - AP_POSTGRES_HOST=postgres
- AP_POSTGRES_PORT=5432 - AP_POSTGRES_PORT=5432
- AP_QUEUE_MODE=REDIS
- AP_REDIS_HOST=redis - AP_REDIS_HOST=redis
- AP_REDIS_PORT=6379 - AP_REDIS_PORT=6379
- AP_REDIS_URL=redis://:${REDIS_PASSWORD}@redis:6379 - AP_REDIS_PASSWORD=${REDIS_PASSWORD}
- AP_ENVIRONMENT=prod - AP_ENVIRONMENT=prod
- AP_FRONTEND_URL=https://${AP_HOST} - AP_FRONTEND_URL=https://${AP_HOST}
- AP_ENCRYPTION_KEY=${AP_ENCRYPTION_KEY} - AP_ENCRYPTION_KEY=${AP_ENCRYPTION_KEY}
@@ -30,7 +32,7 @@ services:
- AP_TRIGGER_DEFAULT_POLL_INTERVAL=5 - AP_TRIGGER_DEFAULT_POLL_INTERVAL=5
- AP_FLOW_TIMEOUT_SECONDS=600 - AP_FLOW_TIMEOUT_SECONDS=600
- AP_TELEMETRY_ENABLED=true - 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: postgres:
image: postgres:14.4 image: postgres:14.4

4
apps/dokploy/templates/chatwoot/docker-compose.yml
View File

@@ -16,10 +16,10 @@ services:
- postgres_data:/var/lib/postgresql/data - postgres_data:/var/lib/postgresql/data
environment: environment:
- POSTGRES_DB=chatwoot_production - POSTGRES_DB=chatwoot_production
- POSTGRES_USER=${POSTGRES_USERNAME} - POSTGRES_USER=postgres
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USERNAME}"] test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5

6
apps/dokploy/templates/chatwoot/index.ts
View File

@@ -9,7 +9,6 @@ import {
export function generate(schema: Schema): Template { export function generate(schema: Schema): Template {
const mainDomain = generateRandomDomain(schema); const mainDomain = generateRandomDomain(schema);
const postgresUsername = "postgres";
const postgresPassword = generatePassword(); const postgresPassword = generatePassword();
const redisPassword = generatePassword(); const redisPassword = generatePassword();
const secretKeyBase = generateBase64(64); const secretKeyBase = generateBase64(64);
@@ -23,9 +22,10 @@ export function generate(schema: Schema): Template {
]; ];
const envs = [ const envs = [
`POSTGRES_DB=chatwoot`, `POSTGRES_USERNAME=postgres`,
`POSTGRES_USER=${postgresUsername}`, `POSTGRES_USER=postgres`,
`POSTGRES_PASSWORD=${postgresPassword}`, `POSTGRES_PASSWORD=${postgresPassword}`,
`POSTGRES_DB=chatwoot_production`,
`REDIS_PASSWORD=${redisPassword}`, `REDIS_PASSWORD=${redisPassword}`,
`CHATWOOT_HOST=${mainDomain}`, `CHATWOOT_HOST=${mainDomain}`,
`SECRET_KEY_BASE=${secretKeyBase}`, `SECRET_KEY_BASE=${secretKeyBase}`,

2
apps/dokploy/templates/windmill/docker-compose.yml
View File

@@ -93,7 +93,7 @@ services:
networks: networks:
- dokploy-network - dokploy-network
volumes: volumes:
- ../files/stacks:/etc/caddy - ../files/Caddyfile:/etc/caddy/Caddyfile
environment: environment:
- BASE_URL=":80" - BASE_URL=":80"
depends_on: depends_on:

2
apps/dokploy/templates/windmill/index.ts
View File

@@ -26,7 +26,7 @@ export function generate(schema: Schema): Template {
const mounts: Template["mounts"] = [ const mounts: Template["mounts"] = [
{ {
filePath: "files/stacks/windmill/Caddyfile", filePath: "Caddyfile",
content: `{$BASE_URL} { content: `{$BASE_URL} {
bind {$ADDRESS} bind {$ADDRESS}
reverse_proxy /ws/* http://lsp:3001 reverse_proxy /ws/* http://lsp:3001