From eb055687989c5d3e8e1b490b4a1d61e0c6778811 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Fri, 10 May 2024 07:29:06 +0800
Subject: [PATCH 01/41] Update README.md
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README.md | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 19e44df0..fde9339a 100644
--- a/README.md
+++ b/README.md
@@ -11,35 +11,34 @@
-Dokploy is a free self-hostable Platform as a Service (PaaS) that simplifies the deployment and management of applications and databases using Docker and Traefik. Designed to enhance efficiency and security, Dokploy allows you to deploy your applications on any VPS.
+Dokploy 是一个免费的可自行托管的平台即服务(PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
-
-## 🌟 Features
-
-- **Applications**: Deploy any type of application (Node.js, PHP, Python, Go, Ruby, etc.) with ease.
-- **Databases**: Create and manage databases with support for MySQL, PostgreSQL, MongoDB, MariaDB, Redis, and more.
-- **Docker Management**: Easily deploy and manage Docker containers.
-- **Traefik Integration**: Automatically integrates with Traefik for routing and load balancing.
-- **Real-time Monitoring**: Monitor CPU, memory, storage, and network usage.
-- **Database Backups**: Automate backups with support for multiple storage destinations.
+## 🌟 特点
-## 🚀 Getting Started
+- **应用**:轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。
+- **数据库**:创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
+- **Docker 管理**: 轻松部署和管理 Docker 容器。
+- **集成特拉菲克**: 自动与特拉菲克集成,用于路由选择和负载平衡。
+- **实时监控**: 监控 CPU、内存、存储和网络使用情况。
+- **数据库备份**: 支持多个存储目的地,实现自动备份。
-To get started run the following command in a VPS:
+## 🚀 入门
+
+要开始使用,请在 VPS 中运行以下命令:
```bash
curl -sSL https://dokploy.com/install.sh | sh
```
-Tested Systems:
+经过测试的系统:
- Ubuntu 20.04
- Debian 11
-## 📄 Documentation
+## 📄 文件
-For detailed documentation, visit [docs.dokploy.com/docs](https://docs.dokploy.com).
+有关详细文档,请访问 [docs.dokploy.com/docs](https://docs.dokploy.com).
From bd47b6f50ab37f7f4a0bdb846476c57ec6a708c9 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Fri, 10 May 2024 07:35:09 +0800
Subject: [PATCH 02/41] Rename README.md to README zhCN .md
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README.md => README zhCN .md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename README.md => README zhCN .md (100%)
diff --git a/README.md b/README zhCN .md
similarity index 100%
rename from README.md
rename to README zhCN .md
From b6a088ac6b50b1527916e99e8e6df2fadfbad4f7 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Fri, 10 May 2024 07:42:01 +0800
Subject: [PATCH 03/41] Create README.md
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README.md | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 README.md
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..d3c0e296
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+
+
+
+
Dokploy
+
+
+
+
+
+
+
+
+
+Dokploy 是一个免费的可自行托管的平台即服务(PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
+
+
+## 🌟 特点
+
+
+- **应用**:轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。
+- **数据库**:创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
+- **Docker 管理**: 轻松部署和管理 Docker 容器。
+- **集成特拉菲克**: 自动与特拉菲克集成,用于路由选择和负载平衡。
+- **实时监控**: 监控 CPU、内存、存储和网络使用情况。
+- **数据库备份**: 支持多个存储目的地,实现自动备份。
+
+## 🚀 入门
+
+要开始使用,请在 VPS 中运行以下命令:
+
+
+```bash
+curl -sSL https://dokploy.com/install.sh | sh
+```
+
+经过测试的系统:
+
+- Ubuntu 20.04
+- Debian 11
+
+## 📄 文件
+
+有关详细文档,请访问 [docs.dokploy.com/docs](https://docs.dokploy.com).
From 824613cce9ff9a72bc6a3631359e0570191d9abe Mon Sep 17 00:00:00 2001
From: hehehai
Date: Sat, 11 May 2024 16:58:55 +0800
Subject: [PATCH 04/41] docs: reset password command fix
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bbda3053..67a8e3ec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ pnpm run docker:push
In the case you lost your password, you can reset it using the following command
```bash
-pnpm run build-server
+pnpm run reset-password
```
If you want to test the webhooks on development mode using localtunnel, make sure to install `localtunnel`
@@ -150,4 +150,4 @@ curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.
- If your pull request fixes an open issue, please reference the issue in the pull request description.
- Once your pull request is merged, you will be automatically added as a contributor to the project.
-Thank you for your contribution!
\ No newline at end of file
+Thank you for your contribution!
From 0a764fbc55a32d5241fa4612a4c5615603b06bbd Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Sat, 11 May 2024 17:06:42 +0800
Subject: [PATCH 05/41] Delete README zhCN .md
Delete the file that is not part of the original md presentation file.
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README zhCN .md | 44 --------------------------------------------
1 file changed, 44 deletions(-)
delete mode 100644 README zhCN .md
diff --git a/README zhCN .md b/README zhCN .md
deleted file mode 100644
index fde9339a..00000000
--- a/README zhCN .md
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
Dokploy
-
-
-
-
-
-
-
-
-
-Dokploy 是一个免费的可自行托管的平台即服务(PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
-
-
-## 🌟 特点
-
-
-- **应用**:轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。
-- **数据库**:创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
-- **Docker 管理**: 轻松部署和管理 Docker 容器。
-- **集成特拉菲克**: 自动与特拉菲克集成,用于路由选择和负载平衡。
-- **实时监控**: 监控 CPU、内存、存储和网络使用情况。
-- **数据库备份**: 支持多个存储目的地,实现自动备份。
-
-## 🚀 入门
-
-要开始使用,请在 VPS 中运行以下命令:
-
-
-```bash
-curl -sSL https://dokploy.com/install.sh | sh
-```
-
-经过测试的系统:
-
-- Ubuntu 20.04
-- Debian 11
-
-## 📄 文件
-
-有关详细文档,请访问 [docs.dokploy.com/docs](https://docs.dokploy.com).
-
From 18a6e6ac8c11b73d98ef51cf1ad6b1590cd5ff3b Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Sat, 11 May 2024 17:23:26 +0800
Subject: [PATCH 06/41] Delete README.md
Because of the renaming of the md introduction file in the second revision, it is the third revision and not part of the original file that was changed at the beginning, so that version of the file is deleted and only the original md file is kept.
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README.md | 43 -------------------------------------------
1 file changed, 43 deletions(-)
delete mode 100644 README.md
diff --git a/README.md b/README.md
deleted file mode 100644
index d3c0e296..00000000
--- a/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
+
+
+
+
+Dokploy 是一个免费的自托管平台即服务 (PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
+
+##🌟 功能
+-**应用程序**: 轻松部署任何类型的应用程序(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](https://docs.dokploy.com).
From 156cac288b6be162b125d291960b3cc7747d2f62 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Sat, 11 May 2024 18:04:09 +0800
Subject: [PATCH 08/41] Update README-zh.md
Modify display exceptions
Forgot the space, so the two ### are not effective
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README-zh.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/README-zh.md b/README-zh.md
index bf58f68e..6afe816f 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -13,13 +13,14 @@
Dokploy 是一个免费的自托管平台即服务 (PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
-##🌟 功能
+## 🌟 功能
-**应用程序**: 轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。-数据库: 创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
-**Docker 管理**: 轻松部署和管理 Docker 容器。
-**Traefik 集成**: 自动与 Traefik 集成,用于路由和负载均衡。
实时监控: 监控 CPU、内存、存储和网络使用情况。
数据库备份: 支持多种存储目的地自动备份。
-##🚀 入门
+
+## 🚀 入门
要开始使用,请在 VPS 上运行以下命令:
```bash
@@ -30,7 +31,7 @@ curl -sSL https://dokploy.com/install.sh | sh
- Ubuntu 20.04
- Debian 11
-
+-
## 📄 文档
如需查看详细的文档资料,请访问[docs.dokploy.com/docs](https://docs.dokploy.com).
From 5682cc12bc69296ef605929a0cebacd874f09a5f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 11 May 2024 16:27:27 -0600
Subject: [PATCH 09/41] chore: update terms and conditions
---
TERMS_AND_CONDITIONS.md | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/TERMS_AND_CONDITIONS.md b/TERMS_AND_CONDITIONS.md
index acf376cd..56ef97fb 100644
--- a/TERMS_AND_CONDITIONS.md
+++ b/TERMS_AND_CONDITIONS.md
@@ -1,25 +1,22 @@
# Terms & Conditions
+**Dokploy core** is a free and open-source solution intended as an alternative to established cloud platforms like Vercel and Netlify.
-Dokploy core is a free and open-source program alternative to Vercel, Netlify, and other cloud services.
+The Dokploy team endeavors to mitigate potential defects and issues through stringent testing and adherence to principles of clean coding. Dokploy is provided "AS IS" without any warranties, express or implied. Refer to the [License](https://github.com/Dokploy/Dokploy/blob/main/LICENSE) for details on permissions and restrictions.
-Developers of Dokploy do their best to prevent bugs and issues through rigorous testing processes and clean code principles. Dokploy 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](https://github.com/Dokploy/Dokploy/blob/main/LICENSE).
-
-By using Dokploy you agree to Terms and Conditions, and the license of Dokploy.
### Description of Service:
-Dokploy core is an open-source program designed to streamline application deployment processes for personal and commercial use. Users are free to install, modify, and run Dokploy on their own machines or within their organizations to enhance their development and deployment workflows. While Dokploy encourages a wide range of uses to foster innovation and efficiency, it is crucial to note that selling Dokploy itself as a service or repackaging it as part of a commercial offering without explicit permission is strictly prohibited. This ensures that the open-source nature of Dokploy remains intact and benefits the community as a whole.
+**Dokploy core** is an open-source tool designed to simplify the deployment of applications for both personal and business use. Users are permitted to install, modify, and operate Dokploy independently or within their organizations to improve their development and deployment operations. It is important to note that any commercial resale or redistribution of Dokploy as a service is strictly forbidden without explicit consent. This prohibition ensures the preservation of Dokploy's open-source character for the benefit of the entire community.
### Our Responsibility
-Dokploy developers will do their best to ensure that Dokploy remains functional and major bugs are resolved quickly. If you have a feature request, you are more than welcome to open a request for it, but the ultimate decision whether or not the feature will be added is taken by Dokploy's core developers.
+The Dokploy development team commits to maintaining the functionality of the software and addressing major issues promptly. While we welcome suggestions for new features, the decision to include them rests solely with the core developers of Dokploy.
### Usage Data
-Dokploy doesn't collect any usage data. It is a free and open-source program, and it is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+**Dokploy** does not collect any user data. It is distributed as a free and open-source tool under the terms of "AS IS", without any implied warranties or conditions.
-### Future changes
+### Future Changes
-Terms of Service / Terms & Conditions may change at any point without a prior notice.
\ No newline at end of file
+The Terms of Service and Terms & Conditions are subject to change without prior notice.
From 71f9e7bbd1ed5fe2d24cf7f12bf8d14c30bbec0f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 11 May 2024 16:27:34 -0600
Subject: [PATCH 10/41] chore: update license
---
LICENSE.MD | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/LICENSE.MD b/LICENSE.MD
index abf659eb..9b02d866 100644
--- a/LICENSE.MD
+++ b/LICENSE.MD
@@ -1,4 +1,4 @@
-Copyright 2024-2024 Mauricio Siu.
+Copyright 2024 Mauricio Siu.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,23 +13,12 @@ See the License for the specific language governing permissions and
limitations under the License.
Appendix:
-In case of a conflict, the terms of this appendix supersede the general apache license.
-- Unless provided with a written agreement or permission, the paid features of Dokploy (as a service) cannot be modified.
-- Unless provided with a written agreement or permission, no persons are permitted to redistribute another paid version of Dokploy.
-- Unless provided with a written agreement or permission, no persons are permitted to create the same paid version of Dokploy.
-- Furthermore, any modifications of free features of Dokploy should be distributed as free & opensource software.
-
-Appendix B:
-
-- **Prohibition of Resale Without Permission:** Notwithstanding any provisions in the main body of the Apache License, Version 2.0, no party is permitted to sell, resell, or otherwise distribute for commercial gain, the software or any of its components, including both original and modified versions, through any form of commercial distribution channels, including but not limited to online marketplaces, software as a service (SaaS) platforms, or physical media distribution, without prior written consent from the copyright holder.
-
-- **Commercial Distribution:** Any form of distribution of Dokploy, whether for direct profit or indirect financial benefit, through commercial channels is strictly prohibited without a separate commercial agreement negotiated with the copyright holder. This includes but is not limited to, offerings on software marketplaces or through third-party distributors.
-
-- **Modification of Paid Features:** The paid features of Dokploy (as a service) may not be modified, integrated into other software, or redistributed in any form without explicit written permission from the copyright holder.
-
-- **Open Source Distribution of Free Features:** Any modifications to the free features of Dokploy must be distributed freely and must not be included in any paid or commercial package without complying with the open-source license terms stipulated in this agreement.
-
-If you have any questions, please feel free to reach out to us.
+In cases of conflict, the provisions in this appendix supersede those in the general Apache License.
+- **Modification of Paid Features:** Written consent or a formal agreement is required for modifying any paid features of Dokploy.
+- **Prohibition of Unauthorized Resale:** No party is permitted to sell, resell, or otherwise distribute for commercial gain, the software or any of its components, including both original and modified versions, without prior written consent from the copyright holder.
+- **Commercial Distribution:** Any distribution of Dokploy, whether for direct profit or indirect financial benefit, through commercial channels is strictly prohibited without a separate commercial agreement negotiated with the copyright holder.
+- **Open Source Distribution of Free Features:** Any modifications to the free features of Dokploy must be distributed freely and must not be included in any paid or commercial package unless they comply with the license and appendix terms specified in this agreement.
+For further inquiries or permissions, please contact us directly.
From 9dffef71e57f5a1fec185a8eb4bbcebd5deb36c2 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Sun, 12 May 2024 09:36:31 +0800
Subject: [PATCH 11/41] Update README-zh.md
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README-zh.md | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/README-zh.md b/README-zh.md
index 6afe816f..c10b38b5 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -13,15 +13,27 @@
Dokploy 是一个免费的自托管平台即服务 (PaaS),它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
+## 语言
+**English**:
+
+[github.com/Dokploy/dokploy/blob/canary/README.md]
+(https://github.com/Dokploy/dokploy/blob/canary/README.md)
+
+**Chinese**:[github.com/fxazkwxm/dokploy/blob/canary/README-zh.md](https://github.com/fxazkwxm/dokploy/blob/canary/README-zh.md)
+
+
+
+
+
## 🌟 功能
--**应用程序**: 轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。-数据库: 创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
+**应用程序**: 轻松部署任何类型的应用程序(Node.js、PHP、Python、Go、Ruby 等)。-数据库: 创建和管理数据库,支持 MySQL、PostgreSQL、MongoDB、MariaDB、Redis 等。
-**Docker 管理**: 轻松部署和管理 Docker 容器。
-**Traefik 集成**: 自动与 Traefik 集成,用于路由和负载均衡。
实时监控: 监控 CPU、内存、存储和网络使用情况。
数据库备份: 支持多种存储目的地自动备份。
## 🚀 入门
-要开始使用,请在 VPS 上运行以下命令:
+要开始使用 请在VPS 上运行以下命令:
```bash
curl -sSL https://dokploy.com/install.sh | sh
From 6989047cbed4b8d43c829d332dcc082aa3fca925 Mon Sep 17 00:00:00 2001
From: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
Date: Sun, 12 May 2024 09:53:26 +0800
Subject: [PATCH 12/41] Create README.md
Signed-off-by: AndroidEnthusiast <85106891+kwxmxb@users.noreply.github.com>
---
README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 README.md
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..19e44df0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+Dokploy ist eine kostenlose und self-hostable Platform as a Service (PaaS), welche das hosten und managen von deinen Projekten und Datenbanken vereinfacht, das geschieht mithilfe von Docker und Treafik. Es ist designt, um deine Leistung und die Sicherheit deiner Projekte zu verbessern. Dokploy erlaubt dir schnell und einfach auf jeder VPS deine Projekte zu verwirklichen.
+
+
+## Explanation
+[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md)
+
+
+
+
+## 🌟 Features
+
+- **Projekte**: - **Projekte**: Hoste jegliche Art von Projekt (Node.js, PHP, Python, Go, Ruby, etc.) mit Einfachheit.
+- **Datenbanken**: Erstelle und manage Datenbanken, wie MySQL, PostgreSQL, MongoDB, MariaDB, Redis, und mehr.
+- **Docker Management**: Einfach Docker container hosten und managen.
+- **Traefik Integration**: Automatische Integration mit Traefik für routing und load balancing
+- **Real-time Monitoring**: Monitor von CPU, RAM, Speicher, und network Nutzung.
+- **Database Backups**: Automatische Backups mit Support für mehrere Speicher Systeme.
+
+
+## 🚀 Getting Started
+
+Um anzufangen führe einfach den folgende command in einer VPS aus:
+
+```bash
+curl -sSL https://dokploy.com/install.sh | sh
+```
+
+Getestete Systems:
+
+- Ubuntu 20.04
+- Debian 11
+
+## 📄 Documentation
+
+Für eine detaillierte Dokumentation, siehe [docs.dokploy.com/docs](https://docs.dokploy.com)
+
From 61d7013a59036d8fa4b3d5e3591284e9c69f3baf Mon Sep 17 00:00:00 2001
From: Freddy <118914591+DontFred@users.noreply.github.com>
Date: Tue, 14 May 2024 10:30:39 +0000
Subject: [PATCH 25/41] Added german readme link to other readme's
---
README-zh.md | 2 ++
README.md | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/README-zh.md b/README-zh.md
index 0e4982e0..e7d14fe5 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -18,6 +18,8 @@ Dokploy 是一个免费的自托管平台即服务 (PaaS),它使用 Docker 和
[中文](README-zh.md)
+[Deutsch](README-de.md)
+
diff --git a/README.md b/README.md
index a1c4708a..62383600 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)
+[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md)
From 30cab150c951f9c387b631019ac52a3d9236416a Mon Sep 17 00:00:00 2001
From: Freddy <118914591+DontFred@users.noreply.github.com>
Date: Wed, 15 May 2024 08:10:36 +0200
Subject: [PATCH 26/41] Changed titles README-de.md
---
README-de.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README-de.md b/README-de.md
index f4fead65..76dca832 100644
--- a/README-de.md
+++ b/README-de.md
@@ -13,13 +13,13 @@
Dokploy ist eine kostenlose und self-hostable Platform as a Service (PaaS), welche das hosten und managen von deinen Projekten und Datenbanken vereinfacht, das geschieht mithilfe von Docker und Treafik. Es ist designt, um deine Leistung und die Sicherheit deiner Projekte zu verbessern. Dokploy erlaubt dir schnell und einfach auf jeder VPS deine Projekte zu verwirklichen.
-## Explanation
+## Erklärung
[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md)
-## 🌟 Features
+## 🌟 Vorteile
- **Projekte**: - **Projekte**: Hoste jegliche Art von Projekt (Node.js, PHP, Python, Go, Ruby, etc.) mit Einfachheit.
- **Datenbanken**: Erstelle und manage Datenbanken, wie MySQL, PostgreSQL, MongoDB, MariaDB, Redis, und mehr.
@@ -29,7 +29,7 @@ Dokploy ist eine kostenlose und self-hostable Platform as a Service (PaaS),
- **Database Backups**: Automatische Backups mit Support für mehrere Speicher Systeme.
-## 🚀 Getting Started
+## 🚀 Loslegen
Um anzufangen führe einfach den folgende command in einer VPS aus:
@@ -42,7 +42,7 @@ Getestete Systems:
- Ubuntu 20.04
- Debian 11
-## 📄 Documentation
+## 📄 Dokumentation
Für eine detaillierte Dokumentation, siehe [docs.dokploy.com/docs](https://docs.dokploy.com)
From d6685e1f4a16aee2f70b09437997987593abbb38 Mon Sep 17 00:00:00 2001
From: Mr1Blaze
Date: Wed, 15 May 2024 21:25:46 +0300
Subject: [PATCH 27/41] 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 00000000..ac4ff664
--- /dev/null
+++ b/README-ru.md
@@ -0,0 +1,47 @@
+
+
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 28/41] 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 62383600..ff142f1e 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 29/41] 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 e7d14fe5..83aa0241 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 30/41] Update README-zh.md
---
README-zh.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README-zh.md b/README-zh.md
index 83aa0241..010ca799 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 31/41] 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 76dca832..29f3482c 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 e0f1691731ffbea9058c1b3742ccd24f7d949ad2 Mon Sep 17 00:00:00 2001
From: Mr1Blaze
Date: Thu, 16 May 2024 06:20:02 +0300
Subject: [PATCH 32/41] Added Russian readme file (#89)
* Added Russian Readme
* Added Russian Path on README.md
* Update README-zh.md linked Russian Language
* Update README-zh.md
* Update README-de.md and Linked Russian Language
---
README-de.md | 2 +-
README-ru.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
README-zh.md | 2 ++
README.md | 2 +-
4 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 README-ru.md
diff --git a/README-de.md b/README-de.md
index 76dca832..29f3482c 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)
diff --git a/README-ru.md b/README-ru.md
new file mode 100644
index 00000000..ac4ff664
--- /dev/null
+++ b/README-ru.md
@@ -0,0 +1,47 @@
+
+
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
diff --git a/README-zh.md b/README-zh.md
index e7d14fe5..010ca799 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -20,6 +20,8 @@ Dokploy 是一个免费的自托管平台即服务 (PaaS),它使用 Docker 和
[Deutsch](README-de.md)
+[Русский Язык](README-ru.md)
+
diff --git a/README.md b/README.md
index 62383600..ff142f1e 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 b4c07ce6d169f6d092640dc5e2b9e7bb7a7f5eb6 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Fri, 17 May 2024 02:54:35 -0600
Subject: [PATCH 33/41] Update LICENSE.MD
---
LICENSE.MD | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/LICENSE.MD b/LICENSE.MD
index 9b02d866..9c53a3bc 100644
--- a/LICENSE.MD
+++ b/LICENSE.MD
@@ -1,3 +1,5 @@
+# License
+
Copyright 2024 Mauricio Siu.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -9,16 +11,13 @@ You may obtain a copy of the License at
Unless required by applicable law or agreed to in writing, software
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.
+See the License for the specific language governing permissions and limitations under the License.
-Appendix:
+## Appendix
-In cases of conflict, the provisions in this appendix supersede those in the general Apache License.
+In the event of a conflict, the provisions in this appendix shall take precedence over those in the Apache License.
-- **Modification of Paid Features:** Written consent or a formal agreement is required for modifying any paid features of Dokploy.
-- **Prohibition of Unauthorized Resale:** No party is permitted to sell, resell, or otherwise distribute for commercial gain, the software or any of its components, including both original and modified versions, without prior written consent from the copyright holder.
-- **Commercial Distribution:** Any distribution of Dokploy, whether for direct profit or indirect financial benefit, through commercial channels is strictly prohibited without a separate commercial agreement negotiated with the copyright holder.
-- **Open Source Distribution of Free Features:** Any modifications to the free features of Dokploy must be distributed freely and must not be included in any paid or commercial package unless they comply with the license and appendix terms specified in this agreement.
+- **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.
For further inquiries or permissions, please contact us directly.
From d539b80ef786ca0ff1dfa448f376f18c3cece53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E5=A4=B4981?=
Date: Sat, 18 May 2024 11:43:52 +0800
Subject: [PATCH 34/41] fix: dashboard layout styles (#86)
* fix: dashboard layout scroll
* feat: dashboard nav style animation
* chore: code input font
* style: format code
* pref: alert component extraction
* fix: global font var not found
* fix: code path beak line
* chore: remove framer-motion
* fix: status color
---
.gitignore | 3 +-
components/auth/login-2fa.tsx | 2 +-
.../advanced/general/add-command.tsx | 6 +-
.../application/advanced/ports/add-port.tsx | 17 +-
.../advanced/ports/update-port.tsx | 12 +-
.../advanced/redirects/add-redirect.tsx | 11 +-
.../advanced/redirects/update-redirect.tsx | 12 +-
.../advanced/security/add-security.tsx | 11 +-
.../advanced/security/update-security.tsx | 12 +-
.../traefik/update-traefik-config.tsx | 13 +-
.../advanced/volumes/add-volumes.tsx | 2 +-
.../application/domains/add-domain.tsx | 12 +-
.../application/domains/update-domain.tsx | 12 +-
.../application/environment/show.tsx | 2 +-
.../application/update-application.tsx | 10 +-
.../docker/config/show-container-config.tsx | 4 +-
.../dashboard/docker/logs/docker-logs-id.tsx | 7 +-
.../docker/terminal/docker-terminal-modal.tsx | 1 -
.../docker/terminal/docker-terminal.tsx | 21 +-
.../file-system/show-traefik-file.tsx | 21 +-
.../file-system/show-traefik-system.tsx | 2 +-
.../environment/show-mariadb-environment.tsx | 2 +-
.../dashboard/mariadb/update-mariadb.tsx | 10 +-
.../environment/show-mongo-environment.tsx | 2 +-
components/dashboard/mongo/update-mongo.tsx | 10 +-
.../environment/show-mysql-environment.tsx | 2 +-
components/dashboard/mysql/update-mysql.tsx | 10 +-
.../environment/show-postgres-environment.tsx | 2 +-
.../dashboard/postgres/update-postgres.tsx | 10 +-
.../dashboard/project/add-application.tsx | 12 +-
components/dashboard/project/add-database.tsx | 2 +-
components/dashboard/projects/add.tsx | 12 +-
components/dashboard/projects/show.tsx | 6 +-
components/dashboard/projects/update.tsx | 10 +-
components/dashboard/redis/update-redis.tsx | 10 +-
.../settings/certificates/add-certificate.tsx | 272 +++++++++---------
.../settings/destination/add-destination.tsx | 11 +-
.../destination/update-destination.tsx | 12 +-
.../settings/users/add-permissions.tsx | 12 +-
.../dashboard/settings/users/add-user.tsx | 11 +-
.../dashboard/settings/users/show-users.tsx | 2 +-
.../dashboard/settings/users/update-user.tsx | 12 +-
.../web-server/show-main-traefik-config.tsx | 17 +-
.../show-server-middleware-config.tsx | 17 +-
.../web-server/show-server-traefik-config.tsx | 17 +-
components/layouts/dashboard-layout.tsx | 16 +-
components/layouts/navbar.tsx | 2 +-
components/layouts/navigation-tabs.tsx | 135 +++++----
components/shared/alert-block.tsx | 51 ++++
components/shared/status-tooltip.tsx | 8 +-
components/ui/alert.tsx | 59 ++++
components/ui/file-tree.tsx | 4 +-
package.json | 4 +-
pages/_app.tsx | 59 ++--
pages/_document.tsx | 15 +-
styles/globals.css | 5 -
tailwind.config.ts | 4 +
57 files changed, 502 insertions(+), 536 deletions(-)
create mode 100644 components/shared/alert-block.tsx
create mode 100644 components/ui/alert.tsx
diff --git a/.gitignore b/.gitignore
index bfbda236..61e00971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,5 @@ yarn-error.log*
/.data
/.main
-*.lockb
\ No newline at end of file
+*.lockb
+*.rdb
diff --git a/components/auth/login-2fa.tsx b/components/auth/login-2fa.tsx
index 17b2d483..6bf03d0c 100644
--- a/components/auth/login-2fa.tsx
+++ b/components/auth/login-2fa.tsx
@@ -61,7 +61,7 @@ export const Login2FA = ({ authId }: Props) => {
id: authId,
})
.then(() => {
- toast.success("Signin succesfully", {
+ toast.success("Signin successfully", {
duration: 2000,
});
diff --git a/components/dashboard/application/advanced/general/add-command.tsx b/components/dashboard/application/advanced/general/add-command.tsx
index b7de2ae6..a898607d 100644
--- a/components/dashboard/application/advanced/general/add-command.tsx
+++ b/components/dashboard/application/advanced/general/add-command.tsx
@@ -26,11 +26,11 @@ interface Props {
applicationId: string;
}
-const AddRedirectchema = z.object({
+const AddRedirectSchema = z.object({
command: z.string(),
});
-type AddCommand = z.infer;
+type AddCommand = z.infer;
export const AddCommand = ({ applicationId }: Props) => {
const { data } = api.application.one.useQuery(
@@ -48,7 +48,7 @@ export const AddCommand = ({ applicationId }: Props) => {
defaultValues: {
command: "",
},
- resolver: zodResolver(AddRedirectchema),
+ resolver: zodResolver(AddRedirectSchema),
});
useEffect(() => {
diff --git a/components/dashboard/application/advanced/ports/add-port.tsx b/components/dashboard/application/advanced/ports/add-port.tsx
index ceb9657c..52b303a5 100644
--- a/components/dashboard/application/advanced/ports/add-port.tsx
+++ b/components/dashboard/application/advanced/ports/add-port.tsx
@@ -18,8 +18,8 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import { api } from "@/utils/api";
+import { AlertBlock } from "@/components/shared/alert-block";
import { zodResolver } from "@hookform/resolvers/zod";
-import { AlertTriangle } from "lucide-react";
import { useEffect } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
@@ -33,7 +33,7 @@ import {
} from "@/components/ui/select";
import { z } from "zod";
-const AddPortchema = z.object({
+const AddPortSchema = z.object({
publishedPort: z.number().int().min(1).max(65535),
targetPort: z.number().int().min(1).max(65535),
protocol: z.enum(["tcp", "udp"], {
@@ -41,7 +41,7 @@ const AddPortchema = z.object({
}),
});
-type AddPort = z.infer;
+type AddPort = z.infer;
interface Props {
applicationId: string;
@@ -62,7 +62,7 @@ export const AddPort = ({
publishedPort: 0,
targetPort: 0,
},
- resolver: zodResolver(AddPortchema),
+ resolver: zodResolver(AddPortSchema),
});
useEffect(() => {
@@ -100,14 +100,7 @@ export const AddPort = ({
Ports are used to expose your application to the internet.
- {isError && (
-