From 03d1e974dde57bdb14bd5c9d9b0b7027d405f92f Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:53:12 -0600 Subject: [PATCH 1/4] Update LICENSE.MD --- LICENSE.MD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.MD b/LICENSE.MD index 9031c94b9..59e9d822e 100644 --- a/LICENSE.MD +++ b/LICENSE.MD @@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations ## Additional Terms for Specific Features -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: +The following additional terms apply to the multi-node support, Docker Compose file and Multi Server features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License: -- **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. +- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support, Docker Compose file support and Multi Server, will always be free to use in the self-hosted version. +- **Restriction on Resale**: The multi-node support, Docker Compose file support and Multi Server 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, Docker Compose file support and Multi Server features must be distributed freely and cannot be sold or offered as a service. For further inquiries or permissions, please contact us directly. From cb5ca100a6764e941471cf57d345faafe6f9c9ba Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 22 Oct 2024 20:00:29 -0600 Subject: [PATCH 2/4] fix(dokploy): use the exact path of functions #578 --- apps/dokploy/reset-password.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/reset-password.ts b/apps/dokploy/reset-password.ts index e13c348ae..f86609368 100644 --- a/apps/dokploy/reset-password.ts +++ b/apps/dokploy/reset-password.ts @@ -1,6 +1,6 @@ -import { findAdmin } from "@dokploy/server"; -import { updateAuthById } from "@dokploy/server"; -import { generateRandomPassword } from "@dokploy/server"; +import { generateRandomPassword } from "@dokploy/server/dist/auth/random-password"; +import { findAdmin } from "@dokploy/server/dist/services/admin"; +import { updateAuthById } from "@dokploy/server/dist/services/auth"; (async () => { try { From 76ed1107c21b43978536eb2e37aefef1036fcb91 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 22 Oct 2024 20:19:49 -0600 Subject: [PATCH 3/4] refactor(dokploy): add -r flag to read the enviroments vars --- apps/dokploy/package.json | 2 +- apps/dokploy/reset-password.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index ea39b503e..cee3395c3 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -10,7 +10,7 @@ "build-server": "tsx esbuild.config.ts", "build-next": "next build", "setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run", - "reset-password": "node dist/reset-password.mjs", + "reset-password": "node -r dotenv/config dist/reset-password.mjs", "dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", "studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts", "migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts", diff --git a/apps/dokploy/reset-password.ts b/apps/dokploy/reset-password.ts index f86609368..e13c348ae 100644 --- a/apps/dokploy/reset-password.ts +++ b/apps/dokploy/reset-password.ts @@ -1,6 +1,6 @@ -import { generateRandomPassword } from "@dokploy/server/dist/auth/random-password"; -import { findAdmin } from "@dokploy/server/dist/services/admin"; -import { updateAuthById } from "@dokploy/server/dist/services/auth"; +import { findAdmin } from "@dokploy/server"; +import { updateAuthById } from "@dokploy/server"; +import { generateRandomPassword } from "@dokploy/server"; (async () => { try { From 8faa6ae1cf2cf08f57d8225dc09b4e2ce6138347 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 22 Oct 2024 20:29:57 -0600 Subject: [PATCH 4/4] chore(version): bump version --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index cee3395c3..0bfd938ce 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.10.1", + "version": "v0.10.2", "private": true, "license": "Apache-2.0", "type": "module",