From d6685e1f4a16aee2f70b09437997987593abbb38 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 15 May 2024 21:25:46 +0300 Subject: [PATCH 01/18] Added Russian Readme --- README-ru.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 README-ru.md diff --git a/README-ru.md b/README-ru.md new file mode 100644 index 000000000..ac4ff6647 --- /dev/null +++ b/README-ru.md @@ -0,0 +1,47 @@ +
+

Dokploy

+
+ +
+Логотип Dokploy +
+
+ + + +Dokploy - это бесплатная самоустанавливаемая Платформа как Сервис (PaaS), которая упрощает развертывание и управление приложениями и базами данных с использованием Docker и Traefik. Разработанный для повышения эффективности и безопасности, Dokploy позволяет развертывать ваши приложения на любом VPS. + + + +## Объяснение +[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) + + + + +## 🌟 Особенности + +- **Приложения**: Легко развертывать любой тип приложения (Node.js, PHP, Python, Go, Ruby и др.). +- **Базы данных**: Создавайте и управляйте базами данных с поддержкой MySQL, PostgreSQL, MongoDB, MariaDB, Redis и других. +- **Управление Docker**: Легко развертывать и управляйте контейнерами Docker. +- **Интеграция с Traefik**: Автоматически интегрируется с Traefik для маршрутизации и балансировки нагрузки. +- **Мониторинг в реальном времени**: Отслеживайте использование CPU, памяти, хранилища и сети. +- **Резервное копирование баз данных**: Автоматизируйте резервное копирование с поддержкой нескольких мест хранения. + + +## 🚀 Начало работы + +Чтобы установить, выполните следующую команду на VPS: + + +```bash +curl -sSL https://dokploy.com/install.sh | sh +``` + +Проверенные системы: + +- Ubuntu 20.04 +- Debian 11 + +## 📄 Документация +Для подробной документации посетите docs.dokploy.com/docs. \ No newline at end of file From e5830898978444ce4224a22d6939817bf95b9099 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 15 May 2024 21:27:02 +0300 Subject: [PATCH 02/18] Added Russian Path on README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 623836007..ff142f1e7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Dokploy is a free self-hostable Platform as a Service (PaaS) that simplifies the ## Explanation -[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) +[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) | [Русский Язык](README-ru.md) From fe788d72091a2c8149e8cccf3932c274d1ee40a5 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 15 May 2024 21:28:18 +0300 Subject: [PATCH 03/18] Update README-zh.md linked Russian Language --- README-zh.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README-zh.md b/README-zh.md index e7d14fe58..83aa0241a 100644 --- a/README-zh.md +++ b/README-zh.md @@ -19,6 +19,7 @@ Dokploy 是一个免费的自托管平台即服务 (PaaS)，它使用 Docker 和 [中文](README-zh.md) [Deutsch](README-de.md) +[Русский Язык](README-ru.md) From 5f52345b2e9a170031cfb80385528b296132b77c Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 15 May 2024 21:28:45 +0300 Subject: [PATCH 04/18] Update README-zh.md --- README-zh.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README-zh.md b/README-zh.md index 83aa0241a..010ca799c 100644 --- a/README-zh.md +++ b/README-zh.md @@ -19,6 +19,7 @@ Dokploy 是一个免费的自托管平台即服务 (PaaS)，它使用 Docker 和 [中文](README-zh.md) [Deutsch](README-de.md) + [Русский Язык](README-ru.md) From 9d02fd52075879db28ac7ea06b45249d74564334 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 15 May 2024 21:29:52 +0300 Subject: [PATCH 05/18] Update README-de.md and Linked Russian Language --- README-de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-de.md b/README-de.md index 76dca832b..29f3482c4 100644 --- a/README-de.md +++ b/README-de.md @@ -14,7 +14,7 @@ Dokploy ist eine kostenlose und self-hostable Platform as a Service (PaaS), ## Erklärung -[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) +[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) | [Русский Язык](README-ru.md) From 92afac8044c2fe054dc0bd9135506f70030821e0 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 22 May 2024 22:35:06 +0300 Subject: [PATCH 06/18] Added new tested system README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ff142f1e7..28c11f9ab 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ Tested Systems: - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## 📄 Documentation From 270bdc9da8387c020b7c6b4d14b46b472388b8e8 Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 22 May 2024 22:35:56 +0300 Subject: [PATCH 07/18] Added new tested system on README-zh.md --- README-zh.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README-zh.md b/README-zh.md index 010ca799c..1832800c0 100644 --- a/README-zh.md +++ b/README-zh.md @@ -45,6 +45,8 @@ curl -sSL https://dokploy.com/install.sh | sh - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## 📄 文档 From 12b56252dc86114ef28407e6f9152d5c0aa682aa Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 22 May 2024 22:36:39 +0300 Subject: [PATCH 08/18] Added new tested system on README-ru.md --- README-ru.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README-ru.md b/README-ru.md index ac4ff6647..a63e76f09 100644 --- a/README-ru.md +++ b/README-ru.md @@ -42,6 +42,8 @@ curl -sSL https://dokploy.com/install.sh | sh - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## 📄 Документация -Для подробной документации посетите docs.dokploy.com/docs. \ No newline at end of file +Для подробной документации посетите docs.dokploy.com/docs. From 6b2be464f5237f8e465a565c85d0c0e3df29db3f Mon Sep 17 00:00:00 2001 From: Mr1Blaze Date: Wed, 22 May 2024 22:37:15 +0300 Subject: [PATCH 09/18] Added new tested system on README-de.md --- README-de.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README-de.md b/README-de.md index 29f3482c4..2d6734062 100644 --- a/README-de.md +++ b/README-de.md @@ -41,6 +41,8 @@ Getestete Systems: - Ubuntu 20.04 - Debian 11 +- Fedora 40 +- Centos 9 ## 📄 Dokumentation From 642deac709a53236ad539eb6556bca03844dcdc8 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Wed, 22 May 2024 22:00:49 -0600 Subject: [PATCH 10/18] fix(100#): Remove published port in the redis database to be not exposed to the internet --- server/setup/redis-setup.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/setup/redis-setup.ts b/server/setup/redis-setup.ts index b887e04d2..40886bd09 100644 --- a/server/setup/redis-setup.ts +++ b/server/setup/redis-setup.ts @@ -33,7 +33,9 @@ export const initializeRedis = async () => { Ports: [ { TargetPort: 6379, - PublishedPort: 6379, + ...(process.env.NODE_ENV === "development" + ? { PublishedPort: 6379 } + : {}), Protocol: "tcp", }, ], From 9a94cffe0014c43a45fe1d7cd760b439982b41db Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Wed, 22 May 2024 22:06:34 -0600 Subject: [PATCH 11/18] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d3c69803..5b1099ea2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.0.3", + "version": "v0.0.4", "private": true, "license": "AGPL-3.0-only", "type": "module", From 2362130927d543183494a31420a5d35c4aa2bf6e Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 23 May 2024 02:15:40 -0600 Subject: [PATCH 12/18] Update LICENSE.MD --- LICENSE.MD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/LICENSE.MD b/LICENSE.MD index 9c53a3bc0..9031c94b9 100644 --- a/LICENSE.MD +++ b/LICENSE.MD @@ -1,5 +1,7 @@ # License +## Core License (Apache License 2.0) + Copyright 2024 Mauricio Siu. Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,11 +15,12 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -## Appendix +## Additional Terms for Specific Features -In the event of a conflict, the provisions in this appendix shall take precedence over those in the Apache License. +The following additional terms apply to the multi-node support and Docker Compose file support features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License: -- **Modification Distribution:** Any modifications to the software must be distributed freely. -- **Future Paid Features:** Any future paid features of Dokploy cannot be sold or offered as a service by any party other than the copyright holder without prior written consent. +- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support and Docker Compose file support, will always be free to use in the self-hosted version. +- **Restriction on Resale**: The multi-node support and Docker Compose file support features cannot be sold or offered as a service by any party other than the copyright holder without prior written consent. +- **Modification Distribution**: Any modifications to the multi-node support and Docker Compose file support features must be distributed freely and cannot be sold or offered as a service. For further inquiries or permissions, please contact us directly. From 422187cd4b4e73b52be92adbada91d80c6b0a546 Mon Sep 17 00:00:00 2001 From: hehehai Date: Thu, 23 May 2024 17:41:24 +0800 Subject: [PATCH 13/18] feat: appearance theme support system config --- components/dashboard/projects/show.tsx | 4 +- .../dashboard/settings/appearance-form.tsx | 58 ++++++++----------- .../settings/github/github-setup.tsx | 4 +- .../settings/profile/profile-form.tsx | 6 +- components/layouts/project-layout.tsx | 2 +- components/layouts/settings-layout.tsx | 4 +- components/ui/file-tree.tsx | 3 +- pages/dashboard/project/[projectId].tsx | 2 +- public/images/theme-dark.svg | 1 + public/images/theme-light.svg | 1 + public/images/theme-system.svg | 1 + 11 files changed, 39 insertions(+), 47 deletions(-) create mode 100644 public/images/theme-dark.svg create mode 100644 public/images/theme-light.svg create mode 100644 public/images/theme-system.svg diff --git a/components/dashboard/projects/show.tsx b/components/dashboard/projects/show.tsx index 4604f20b4..4aa721268 100644 --- a/components/dashboard/projects/show.tsx +++ b/components/dashboard/projects/show.tsx @@ -89,9 +89,9 @@ export const ShowProjects = () => {
- + {project.name} - +
diff --git a/components/dashboard/settings/appearance-form.tsx b/components/dashboard/settings/appearance-form.tsx index 6623e5a2f..75b5d0d99 100644 --- a/components/dashboard/settings/appearance-form.tsx +++ b/components/dashboard/settings/appearance-form.tsx @@ -25,7 +25,7 @@ import { } from "@/components/ui/card"; const appearanceFormSchema = z.object({ - theme: z.enum(["light", "dark"], { + theme: z.enum(["light", "dark", "system"], { required_error: "Please select a theme.", }), }); @@ -34,7 +34,7 @@ type AppearanceFormValues = z.infer; // This can come from your database or API. const defaultValues: Partial = { - theme: "light", + theme: "system", }; export function AppearanceForm() { @@ -46,7 +46,7 @@ export function AppearanceForm() { useEffect(() => { form.reset({ - theme: theme === "light" ? "light" : "dark", + theme: (theme ?? "system") as AppearanceFormValues["theme"], }); }, [form, theme]); function onSubmit(data: AppearanceFormValues) { @@ -81,28 +81,15 @@ export function AppearanceForm() { onValueChange={field.onChange} defaultValue={field.value} value={field.value} - className="grid max-w-md grid-cols-1 sm:grid-cols-2 gap-8 pt-2" + className="grid max-w-md md:max-w-lg grid-cols-1 sm:grid-cols-3 gap-8 pt-2" > -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ light
Light @@ -114,27 +101,30 @@ export function AppearanceForm() { -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ dark
Dark + + + + + +
+ system +
+ + System + + + ); diff --git a/components/dashboard/settings/github/github-setup.tsx b/components/dashboard/settings/github/github-setup.tsx index 6e9a80586..9d6d013b6 100644 --- a/components/dashboard/settings/github/github-setup.tsx +++ b/components/dashboard/settings/github/github-setup.tsx @@ -100,7 +100,7 @@ export const GithubSetup = () => { <> {data?.githubAppName ? (
- + Youve successfully created a GitHub app named {data.githubAppName}! The next step is to install this app in your GitHub account. @@ -121,7 +121,7 @@ export const GithubSetup = () => { ) : (
- + To integrate your GitHub account with our services, youll need to create and install a GitHub app. This process is straightforward and only takes a few minutes. Click the diff --git a/components/dashboard/settings/profile/profile-form.tsx b/components/dashboard/settings/profile/profile-form.tsx index d79861174..ea227382c 100644 --- a/components/dashboard/settings/profile/profile-form.tsx +++ b/components/dashboard/settings/profile/profile-form.tsx @@ -147,11 +147,11 @@ export const ProfileForm = () => { }} defaultValue={field.value} value={field.value} - className="flex flex-row flex-wrap gap-2 max-xl:justify-cente" + className="flex flex-row flex-wrap gap-2 max-xl:justify-center" > {randomImages.map((image) => ( - + { key={image} src={image} alt="avatar" - className="h-12 w-12 rounded-full border transition-transform" + className="h-12 w-12 rounded-full border hover:p-px hover:border-primary transition-transform" /> diff --git a/components/layouts/project-layout.tsx b/components/layouts/project-layout.tsx index 6b5f5110b..b4c857388 100644 --- a/components/layouts/project-layout.tsx +++ b/components/layouts/project-layout.tsx @@ -8,7 +8,7 @@ export const ProjectLayout = ({ children }: Props) => { return (
diff --git a/components/layouts/settings-layout.tsx b/components/layouts/settings-layout.tsx index 094bf40ea..caff614ed 100644 --- a/components/layouts/settings-layout.tsx +++ b/components/layouts/settings-layout.tsx @@ -97,12 +97,12 @@ interface NavProps { export const Nav = ({ links }: NavProps) => { const router = useRouter(); + console.log(router.pathname, links); return (