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

Merge branch 'canary' into 262-ssh-keys-are-not-reusable-after-a-dokploy-update

Browse Source
This commit is contained in:
Mauricio Siu
2024-07-25 02:10:51 -06:00
parent 9e47103131 06c8688ddd
commit 135894da2a
6 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/setup/traefik-setup.ts
View File

@@ -1,4 +1,4 @@
import { existsSync, mkdirSync, writeFileSync } from "node:fs"; import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
import path from "node:path"; import path from "node:path";
import type { CreateServiceOptions } from "dockerode"; import type { CreateServiceOptions } from "dockerode";
import { dump } from "js-yaml"; import { dump } from "js-yaml";
@@ -86,6 +86,7 @@ export const initializeTraefik = async () => {
export const createDefaultServerTraefikConfig = () => { export const createDefaultServerTraefikConfig = () => {
const configFilePath = path.join(DYNAMIC_TRAEFIK_PATH, "dokploy.yml"); const configFilePath = path.join(DYNAMIC_TRAEFIK_PATH, "dokploy.yml");
if (existsSync(configFilePath)) { if (existsSync(configFilePath)) {
console.log("Default traefik config already exists"); console.log("Default traefik config already exists");
return; return;
@@ -125,6 +126,11 @@ export const createDefaultServerTraefikConfig = () => {
export const createDefaultTraefikConfig = () => { export const createDefaultTraefikConfig = () => {
const mainConfig = path.join(MAIN_TRAEFIK_PATH, "traefik.yml"); const mainConfig = path.join(MAIN_TRAEFIK_PATH, "traefik.yml");
const acmeJsonPath = path.join(DYNAMIC_TRAEFIK_PATH, "acme.json");
if (existsSync(acmeJsonPath)) {
chmodSync(acmeJsonPath, "600");
}
if (existsSync(mainConfig)) { if (existsSync(mainConfig)) {
console.log("Main config already exists"); console.log("Main config already exists");
return; return;

24
templates/appsmith/docker-compose.yml
View File

@@ -1,17 +1,17 @@
version: "3.8" version: "3.8"
services: services:
appsmith: appsmith:
image: index.docker.io/appsmith/appsmith-ee:v1.29 image: index.docker.io/appsmith/appsmith-ee:v1.29
networks: networks:
- dokploy-network - dokploy-network
ports: ports:
- ${APP_SMITH_PORT} - ${APP_SMITH_PORT}
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.${HASH}.rule=Host(`${APP_SMITH_HOST}`)" - "traefik.http.routers.${HASH}.rule=Host(`${APP_SMITH_HOST}`)"
- "traefik.http.services.${HASH}.loadbalancer.server.port=${APP_SMITH_PORT}" - "traefik.http.services.${HASH}.loadbalancer.server.port=${APP_SMITH_PORT}"
volumes: volumes:
- ./stacks:/appsmith-stacks - ../files/stacks:/appsmith-stacks
networks: networks:
dokploy-network: dokploy-network:

4
templates/directus/docker-compose.yml
View File

@@ -23,8 +23,8 @@ services:
ports: ports:
- 8055 - 8055
volumes: volumes:
- ./uploads:/directus/uploads - ../files/uploads:/directus/uploads
- ./extensions:/directus/extensions - ../files/extensions:/directus/extensions
depends_on: depends_on:
- cache - cache
- database - database

11
templates/listmonk/docker-compose.yml
View File

@@ -23,10 +23,15 @@ services:
networks: networks:
- dokploy-network - dokploy-network
volumes: volumes:
- ./config.toml:/listmonk/config.toml - ../files/config.toml:/listmonk/config.toml
depends_on: depends_on:
- db - db
command: [sh, -c, "sleep 3 && ./listmonk --install --idempotent --yes --config config.toml"] command:
[
sh,
-c,
"sleep 3 && ./listmonk --install --idempotent --yes --config config.toml",
]
app: app:
restart: unless-stopped restart: unless-stopped
@@ -41,7 +46,7 @@ services:
- db - db
- setup - setup
volumes: volumes:
- ./config.toml:/listmonk/config.toml - ../files/config.toml:/listmonk/config.toml
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.${HASH}.rule=Host(`${LISTMONK_HOST}`)" - "traefik.http.routers.${HASH}.rule=Host(`${LISTMONK_HOST}`)"

7
templates/odoo/docker-compose.yml
View File

@@ -1,4 +1,4 @@
version: '3.8' version: "3.8"
services: services:
web: web:
image: odoo:16.0 image: odoo:16.0
@@ -18,8 +18,8 @@ services:
- "traefik.http.services.${HASH}.loadbalancer.server.port=${ODOO_PORT}" - "traefik.http.services.${HASH}.loadbalancer.server.port=${ODOO_PORT}"
volumes: volumes:
- odoo-web-data:/var/lib/odoo - odoo-web-data:/var/lib/odoo
- ./config:/etc/odoo - ../files/config:/etc/odoo
- ./addons:/mnt/extra-addons - ../files/addons:/mnt/extra-addons
db: db:
image: postgres:13 image: postgres:13
@@ -36,7 +36,6 @@ volumes:
odoo-web-data: odoo-web-data:
odoo-db-data: odoo-db-data:
networks: networks:
dokploy-network: dokploy-network:
external: true external: true

4
templates/plausible/docker-compose.yml
View File

@@ -18,8 +18,8 @@ services:
volumes: volumes:
- event-data:/var/lib/clickhouse - event-data:/var/lib/clickhouse
- event-logs:/var/log/clickhouse-server - event-logs:/var/log/clickhouse-server
- ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro - ../files/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
- ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro - ../files/clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
ulimits: ulimits:
nofile: nofile:
soft: 262144 soft: 262144