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 canary

Browse Source
This commit is contained in:
Mauricio Siu
2024-11-10 18:39:11 -06:00
committed by GitHub
parent 046923aeb3 4646b7d0ec
commit 3fee18d06e
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -39,6 +39,8 @@ Dokploy includes multiple features to make your life easier.
To get started, run the following command on a VPS: To get started, run the following command on a VPS:
Want to skip the installation process? [Try the Dokploy Cloud](https://app.dokploy.com).
```bash ```bash
curl -sSL https://dokploy.com/install.sh | sh curl -sSL https://dokploy.com/install.sh | sh
``` ```

2
apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx
View File

@@ -53,7 +53,7 @@ export const AddGithubProvider = () => {
<Dialog open={isOpen} onOpenChange={setIsOpen}> <Dialog open={isOpen} onOpenChange={setIsOpen}>
<DialogTrigger asChild> <DialogTrigger asChild>
<Button variant="secondary" className="flex items-center space-x-1"> <Button variant="secondary" className="flex items-center space-x-1">
<GithubIcon /> <GithubIcon className="text-current fill-current" />
<span>Github</span> <span>Github</span>
</Button> </Button>
</DialogTrigger> </DialogTrigger>

2
apps/dokploy/package.json
View File

@@ -11,7 +11,7 @@
"build-next": "next build", "build-next": "next build",
"setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run", "setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run",
"reset-password": "node -r dotenv/config dist/reset-password.mjs", "reset-password": "node -r dotenv/config dist/reset-password.mjs",
"dev": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", "dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ",
"studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts", "studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts",
"migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts", "migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts",
"migration:run": "tsx -r dotenv/config migration.ts", "migration:run": "tsx -r dotenv/config migration.ts",

2
apps/dokploy/server/server.ts
View File

@@ -24,7 +24,7 @@ import { setupTerminalWebSocketServer } from "./wss/terminal";
config({ path: ".env" }); config({ path: ".env" });
const PORT = Number.parseInt(process.env.PORT || "3000", 10); const PORT = Number.parseInt(process.env.PORT || "3000", 10);
const dev = process.env.NODE_ENV !== "production"; const dev = process.env.NODE_ENV !== "production";
const app = next({ dev, turbopack: dev }); const app = next({ dev });
const handle = app.getRequestHandler(); const handle = app.getRequestHandler();
void app.prepare().then(async () => { void app.prepare().then(async () => {
try { try {

6
packages/server/src/services/mongo.ts
View File

@@ -14,7 +14,7 @@ export type Mongo = typeof mongo.$inferSelect;
export const createMongo = async (input: typeof apiCreateMongo._type) => { export const createMongo = async (input: typeof apiCreateMongo._type) => {
input.appName = input.appName =
`${input.appName}-${generatePassword(6)}` || generateAppName("postgres"); `${input.appName}-${generatePassword(6)}` || generateAppName("mongo");
if (input.appName) { if (input.appName) {
const valid = await validUniqueServerAppName(input.appName); const valid = await validUniqueServerAppName(input.appName);
@@ -72,12 +72,12 @@ export const findMongoById = async (mongoId: string) => {
export const updateMongoById = async ( export const updateMongoById = async (
mongoId: string, mongoId: string,
postgresData: Partial<Mongo>, mongoData: Partial<Mongo>,
) => { ) => {
const result = await db const result = await db
.update(mongo) .update(mongo)
.set({ .set({
...postgresData, ...mongoData,
}) })
.where(eq(mongo.mongoId, mongoId)) .where(eq(mongo.mongoId, mongoId))
.returning(); .returning();