Merge branch 'canary' into template/immich

2025-06-26 18:27:59 +00:00 · 2024-11-22 00:36:09 -06:00
parent fd59beaff1 2dd352ee76
commit 62b635b2f0
16 changed files with 394 additions and 4 deletions
--- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
@@ -37,7 +37,7 @@ const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",
 	}),
-	language: z.enum(["en", "pl", "ru", "zh-Hans"], {
+	language: z.enum(["en", "pl", "ru", "de", "zh-Hans"], {
 		required_error: "Please select a language.",
 	}),
 });
@@ -176,6 +176,7 @@ export function AppearanceForm() {
 													{ label: "English", value: "en" },
 													{ label: "Polski", value: "pl" },
 													{ label: "Русский", value: "ru" },
+													{ label: "Deutsch", value: "de" },
 													{ label: "简体中文", value: "zh-Hans" },
 												].map((preset) => (
 													<SelectItem key={preset.label} value={preset.value}>
--- a/apps/dokploy/next-i18next.config.cjs
+++ b/apps/dokploy/next-i18next.config.cjs
@@ -2,7 +2,7 @@
 module.exports = {
 	i18n: {
 		defaultLocale: "en",
-		locales: ["en", "pl", "ru", "zh-Hans"],
+		locales: ["en", "pl", "ru", "de", "zh-Hans"],
 		localeDetection: false,
 	},
 	fallbackLng: "en",
--- a/apps/dokploy/pages/_app.tsx
+++ b/apps/dokploy/pages/_app.tsx
@@ -71,7 +71,7 @@ export default api.withTRPC(
 		{
 			i18n: {
 				defaultLocale: "en",
-				locales: ["en", "pl", "ru", "zh-Hans"],
+				locales: ["en", "pl", "ru", "de", "zh-Hans"],
 				localeDetection: false,
 			},
 			fallbackLng: "en",
--- a/apps/dokploy/public/locales/de/common.json
+++ b/apps/dokploy/public/locales/de/common.json
@@ -0,0 +1 @@
+{}
--- a/apps/dokploy/public/locales/de/settings.json
+++ b/apps/dokploy/public/locales/de/settings.json
@@ -0,0 +1,44 @@
+{
+	"settings.common.save": "Speichern",
+	"settings.server.domain.title": "Server-Domain",
+	"settings.server.domain.description": "Füg eine Domain zu deiner Server-Anwendung hinzu.",
+	"settings.server.domain.form.domain": "Domain",
+	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt E-Mail",
+	"settings.server.domain.form.certificate.label": "Zertifikat",
+	"settings.server.domain.form.certificate.placeholder": "Wähl ein Zertifikat aus",
+	"settings.server.domain.form.certificateOptions.none": "Keins",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Standard)",
+
+	"settings.server.webServer.title": "Web-Server",
+	"settings.server.webServer.description": "Lade den Web-Server neu oder reinige ihn.",
+	"settings.server.webServer.actions": "Aktionen",
+	"settings.server.webServer.reload": "Neu laden",
+	"settings.server.webServer.watchLogs": "Logs anschauen",
+	"settings.server.webServer.updateServerIp": "Server-IP Aktualisieren",
+	"settings.server.webServer.server.label": "Server",
+	"settings.server.webServer.traefik.label": "Traefik",
+	"settings.server.webServer.traefik.modifyEnv": "Umgebungsvariablen ändern",
+	"settings.server.webServer.storage.label": "Speicherplatz",
+	"settings.server.webServer.storage.cleanUnusedImages": "Nicht genutzte Bilder löschen",
+	"settings.server.webServer.storage.cleanUnusedVolumes": "Nicht genutzte Volumes löschen",
+	"settings.server.webServer.storage.cleanStoppedContainers": "Gestoppte Container löschen",
+	"settings.server.webServer.storage.cleanDockerBuilder": "Docker Builder & System bereinigen",
+	"settings.server.webServer.storage.cleanMonitoring": "Monitoring bereinigen",
+	"settings.server.webServer.storage.cleanAll": "Alles bereinigen",
+
+	"settings.profile.title": "Konto",
+	"settings.profile.description": "Ändere die Details deines Profiles hier.",
+	"settings.profile.email": "E-Mail",
+	"settings.profile.password": "Passwort",
+	"settings.profile.avatar": "Avatar",
+
+	"settings.appearance.title": "Aussehen",
+	"settings.appearance.description": "Pass das Design deines Dashboards an.",
+	"settings.appearance.theme": "Theme",
+	"settings.appearance.themeDescription": "Wähl ein Theme für dein Dashboard aus",
+	"settings.appearance.themes.light": "Hell",
+	"settings.appearance.themes.dark": "Dunkel",
+	"settings.appearance.themes.system": "System",
+	"settings.appearance.language": "Sprache",
+	"settings.appearance.languageDescription": "Wähl eine Sprache für dein Dashboard aus"
+}
--- a/apps/dokploy/public/templates/ryot.png
+++ b/apps/dokploy/public/templates/ryot.png
--- a/apps/dokploy/public/templates/twenty.svg
+++ b/apps/dokploy/public/templates/twenty.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 40 40">
+  <g id="ss11151339769_1">
+    <path d="M 0 40 L 0 0 L 40 0 L 40 40 Z" fill="transparent"></path>
+    <path d="M 34.95 0 L 5.05 0 C 2.262 0 0 2.262 0 5.05 L 0 34.95 C 0 37.738 2.262 40 5.05 40 L 34.95 40 C 37.738 40 40 37.738 40 34.95 L 40 5.05 C 40 2.262 37.738 0 34.95 0 Z M 8.021 14.894 C 8.021 12.709 9.794 10.935 11.979 10.935 L 19.6 10.935 C 19.712 10.935 19.815 11.003 19.862 11.106 C 19.909 11.209 19.888 11.329 19.812 11.415 L 18.141 13.229 C 17.85 13.544 17.441 13.726 17.012 13.726 L 12 13.726 C 11.344 13.726 10.812 14.259 10.812 14.915 L 10.812 17.909 C 10.812 18.294 10.5 18.606 10.115 18.606 L 8.721 18.606 C 8.335 18.606 8.024 18.294 8.024 17.909 L 8.024 14.894 Z M 31.729 25.106 C 31.729 27.291 29.956 29.065 27.771 29.065 L 24.532 29.065 C 22.347 29.065 20.574 27.291 20.574 25.106 L 20.574 19.438 C 20.574 19.053 20.718 18.682 20.979 18.397 L 22.868 16.347 C 22.947 16.262 23.071 16.232 23.182 16.274 C 23.291 16.318 23.365 16.421 23.365 16.538 L 23.365 25.088 C 23.365 25.744 23.897 26.276 24.553 26.276 L 27.753 26.276 C 28.409 26.276 28.941 25.744 28.941 25.088 L 28.941 14.915 C 28.941 14.259 28.409 13.726 27.753 13.726 L 24.032 13.726 C 23.606 13.726 23.2 13.906 22.909 14.218 L 11.812 26.276 L 18.479 26.276 C 18.865 26.276 19.176 26.588 19.176 26.974 L 19.176 28.368 C 19.176 28.753 18.865 29.065 18.479 29.065 L 9.494 29.065 C 8.679 29.065 8.018 28.403 8.018 27.588 L 8.018 26.85 C 8.018 26.479 8.156 26.124 8.409 25.85 L 20.85 12.335 C 21.674 11.441 22.829 10.935 24.044 10.935 L 27.768 10.935 C 29.953 10.935 31.726 12.709 31.726 14.894 L 31.726 25.106 Z" fill="rgb(0,0,0)"></path>
+  </g>
+</svg>
--- a/apps/dokploy/public/templates/yourls.svg
+++ b/apps/dokploy/public/templates/yourls.svg
--- a/apps/dokploy/templates/ryot/docker-compose.yml
+++ b/apps/dokploy/templates/ryot/docker-compose.yml
@@ -0,0 +1,39 @@
+version: '3.7'
+
+services:
+  ryot-app:
+    image: ignisda/ryot:v7.10
+    networks:
+      - dokploy-network
+    environment:
+      - DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@ryot-db:5432/postgres
+      - SERVER_ADMIN_ACCESS_TOKEN=${ADMIN_ACCESS_TOKEN}
+      - TZ=UTC
+      # Optional: Uncomment and set your pro key if you have one
+      # - SERVER_PRO_KEY=${SERVER_PRO_KEY}
+    depends_on:
+      ryot-db:
+        condition: service_healthy
+    restart: always
+    pull_policy: always
+
+  ryot-db:
+    image: postgres:16-alpine
+    networks:
+      - dokploy-network
+    volumes:
+      - ryot-postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=postgres
+      - TZ=UTC
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+
+volumes:
+  ryot-postgres-data: 
--- a/apps/dokploy/templates/ryot/index.ts
+++ b/apps/dokploy/templates/ryot/index.ts
@@ -0,0 +1,34 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateBase64,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const postgresPassword = generatePassword();
+	const adminAccessToken = generateBase64(32);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 8000,
+			serviceName: "ryot-app",
+		},
+	];
+
+	const envs = [
+		`POSTGRES_PASSWORD=${postgresPassword}`,
+		`ADMIN_ACCESS_TOKEN=${adminAccessToken}`,
+		"# Optional: Uncomment and set your pro key if you have one",
+		"# SERVER_PRO_KEY=your_pro_key_here",
+	];
+
+	return {
+		domains,
+		envs,
+	};
+}
--- a/apps/dokploy/templates/templates.ts
+++ b/apps/dokploy/templates/templates.ts
@@ -881,5 +881,50 @@ export const templates: TemplateData[] = [
 		},
 		tags: ["photos", "videos", "backup", "media"],
 		load: () => import("./immich/index").then((m) => m.generate),
+  },
+    {
+		id: "twenty",
+		name: "Twenty CRM",
+		version: "latest",
+		description:
+			"Twenty is a modern CRM offering a powerful spreadsheet interface and open-source alternative to Salesforce.",
+		logo: "twenty.svg",
+		links: {
+			github: "https://github.com/twentyhq/twenty",
+			website: "https://twenty.com",
+			docs: "https://docs.twenty.com",
+		},
+		tags: ["crm", "sales", "business"],
+		load: () => import("./twenty/index").then((m) => m.generate),
+  },
+    {
+		id: "yourls",
+		name: "YOURLS",
+		version: "1.9.2",
+		description:
+			"YOURLS (Your Own URL Shortener) is a set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or Bitly).",
+		logo: "yourls.svg",
+		links: {
+			github: "https://github.com/YOURLS/YOURLS",
+			website: "https://yourls.org/",
+			docs: "https://yourls.org/#documentation",
+		},
+		tags: ["url-shortener", "php"],
+		load: () => import("./yourls/index").then((m) => m.generate),
+  },
+    {
+		id: "ryot",
+		name: "Ryot",
+		version: "v7.10",
+		description:
+			"A self-hosted platform for tracking various media types including movies, TV shows, video games, books, audiobooks, and more.",
+		logo: "ryot.png",
+		links: {
+			github: "https://github.com/IgnisDa/ryot",
+			website: "https://ryot.dev/",
+			docs: "https://ryot.dev/docs/getting-started",
+		},
+		tags: ["media", "tracking", "self-hosted"],
+		load: () => import("./ryot/index").then((m) => m.generate),
 	},
 ];
--- a/apps/dokploy/templates/twenty/docker-compose.yml
+++ b/apps/dokploy/templates/twenty/docker-compose.yml
@@ -0,0 +1,104 @@
+version: "3.9"
+
+services:
+  twenty-change-vol-ownership:
+    image: ubuntu
+    user: root
+    networks:
+      - dokploy-network
+    volumes:
+      - twenty-server-local-data:/tmp/server-local-data
+      - twenty-docker-data:/tmp/docker-data
+    command: >
+      bash -c "
+      chown -R 1000:1000 /tmp/server-local-data
+      && chown -R 1000:1000 /tmp/docker-data"
+
+  twenty-server:
+    image: twentycrm/twenty:latest
+    networks:
+      - dokploy-network
+    volumes:
+      - twenty-server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
+      - twenty-docker-data:/app/docker-data
+    environment:
+      PORT: 3000
+      PG_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@twenty-postgres:5432/twenty
+      SERVER_URL: https://${TWENTY_HOST}
+      FRONT_BASE_URL: https://${TWENTY_HOST}
+      REDIS_URL: redis://twenty-redis:6379
+      ENABLE_DB_MIGRATIONS: "true"
+      SIGN_IN_PREFILLED: "true"
+      STORAGE_TYPE: local
+      APP_SECRET: ${APP_SECRET}
+    depends_on:
+      twenty-change-vol-ownership:
+        condition: service_completed_successfully
+      twenty-postgres:
+        condition: service_healthy
+    healthcheck:
+      test: curl --fail http://localhost:3000/healthz
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+  twenty-worker:
+    image: twentycrm/twenty:latest
+    networks:
+      - dokploy-network
+    command: ["yarn", "worker:prod"]
+    environment:
+      PG_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@twenty-postgres:5432/twenty
+      SERVER_URL: https://${TWENTY_HOST}
+      FRONT_BASE_URL: https://${TWENTY_HOST}
+      REDIS_URL: redis://twenty-redis:6379
+      ENABLE_DB_MIGRATIONS: "false"
+      STORAGE_TYPE: local
+      APP_SECRET: ${APP_SECRET}
+    depends_on:
+      twenty-postgres:
+        condition: service_healthy
+      twenty-server:
+        condition: service_healthy
+    restart: always
+
+  twenty-postgres:
+    image: postgres:16-alpine
+    networks:
+      - dokploy-network
+    volumes:
+      - twenty-postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: twenty
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d twenty"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+  twenty-redis:
+    image: redis:latest
+    networks:
+      - dokploy-network
+    volumes:
+      - twenty-redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+networks:
+  dokploy-network:
+    external: true
+
+volumes:
+  twenty-docker-data:
+  twenty-postgres-data:
+  twenty-server-local-data:
+  twenty-redis-data: 
--- a/apps/dokploy/templates/twenty/index.ts
+++ b/apps/dokploy/templates/twenty/index.ts
@@ -0,0 +1,37 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateBase64,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const dbPassword = generatePassword();
+	const dbUser = "twenty";
+	const appSecret = generateBase64(32);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 3000,
+			serviceName: "twenty-server",
+		},
+	];
+
+	const envs = [
+		`TWENTY_HOST=${mainDomain}`,
+		`DB_USER=${dbUser}`,
+		`DB_PASSWORD=${dbPassword}`,
+		`APP_SECRET=${appSecret}`,
+		"# Optional: Configure storage path",
+		"# STORAGE_LOCAL_PATH=.local-storage",
+	];
+
+	return {
+		domains,
+		envs,
+	};
+}
--- a/apps/dokploy/templates/yourls/docker-compose.yml
+++ b/apps/dokploy/templates/yourls/docker-compose.yml
@@ -0,0 +1,43 @@
+version: '3.7'
+
+services:
+  yourls-app:
+    image: yourls:1.9.2
+    networks:
+      - dokploy-network
+    environment:
+      YOURLS_SITE: https://${YOURLS_HOST}
+      YOURLS_USER: ${YOURLS_ADMIN_USER}
+      YOURLS_PASS: ${YOURLS_ADMIN_PASSWORD}
+      YOURLS_DB_HOST: yourls-mysql
+      YOURLS_DB_USER: yourls
+      YOURLS_DB_PASS: ${MYSQL_PASSWORD}
+      YOURLS_DB_NAME: yourls
+    volumes:
+      - yourls-data:/var/www/html
+    depends_on:
+      yourls-mysql:
+        condition: service_healthy
+    restart: always
+
+  yourls-mysql:
+    image: mysql:5.7
+    networks:
+      - dokploy-network
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: yourls
+      MYSQL_USER: yourls
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - yourls-mysql-data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u$$MYSQL_USER", "-p$$MYSQL_PASSWORD"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: always
+
+volumes:
+  yourls-data:
+  yourls-mysql-data: 
--- a/apps/dokploy/templates/yourls/index.ts
+++ b/apps/dokploy/templates/yourls/index.ts
@@ -0,0 +1,35 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const mysqlPassword = generatePassword();
+	const mysqlRootPassword = generatePassword();
+	const adminPassword = generatePassword();
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 80,
+			serviceName: "yourls-app",
+		},
+	];
+
+	const envs = [
+		`YOURLS_HOST=${mainDomain}`,
+		"YOURLS_ADMIN_USER=admin",
+		`YOURLS_ADMIN_PASSWORD=${adminPassword}`,
+		`MYSQL_PASSWORD=${mysqlPassword}`,
+		`MYSQL_ROOT_PASSWORD=${mysqlRootPassword}`,
+	];
+
+	return {
+		domains,
+		envs,
+	};
+}
--- a/apps/dokploy/utils/hooks/use-locale.ts
+++ b/apps/dokploy/utils/hooks/use-locale.ts
@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";

-const SUPPORTED_LOCALES = ["en", "pl", "ru", "zh-Hans"] as const;
+const SUPPORTED_LOCALES = ["en", "pl", "ru", "de", "zh-Hans"] as const;

 type Locale = (typeof SUPPORTED_LOCALES)[number];