diff --git a/.github/workflows/dokploy.yml b/.github/workflows/dokploy.yml index adcb1bb54..0f65a50c9 100644 --- a/.github/workflows/dokploy.yml +++ b/.github/workflows/dokploy.yml @@ -2,7 +2,7 @@ name: Dokploy Docker Build on: push: - branches: [main, canary, "feat/better-auth-2"] + branches: [main, canary, "1061-custom-docker-service-hostname"] env: IMAGE_NAME: dokploy/dokploy diff --git a/apps/dokploy/server/queues/redis-connection.ts b/apps/dokploy/server/queues/redis-connection.ts index 104e5f4e8..520ce4618 100644 --- a/apps/dokploy/server/queues/redis-connection.ts +++ b/apps/dokploy/server/queues/redis-connection.ts @@ -1,5 +1,8 @@ import type { ConnectionOptions } from "bullmq"; export const redisConfig: ConnectionOptions = { - host: process.env.NODE_ENV === "production" ? "dokploy-redis" : "127.0.0.1", + host: + process.env.NODE_ENV === "production" + ? process.env.REDIS_HOST || "dokploy-redis" + : "127.0.0.1", }; diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts index c8f53f6f9..921724cad 100644 --- a/apps/dokploy/server/server.ts +++ b/apps/dokploy/server/server.ts @@ -7,9 +7,6 @@ import { createDefaultTraefikConfig, initCronJobs, initializeNetwork, - initializePostgres, - initializeRedis, - initializeTraefik, sendDokployRestartNotifications, setupDirectories, } from "@dokploy/server"; @@ -49,14 +46,7 @@ void app.prepare().then(async () => { await initializeNetwork(); createDefaultTraefikConfig(); createDefaultServerTraefikConfig(); - await initializePostgres(); - await initializeTraefik(); - await initializeRedis(); - initCronJobs(); - - // Timeout to wait for the database to be ready - await new Promise((resolve) => setTimeout(resolve, 7000)); await migration(); await sendDokployRestartNotifications(); }