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 'Dokploy:canary' into canary

Browse Source
This commit is contained in:
Oleksandr Honcharov
2024-09-21 00:33:00 +03:00
committed by GitHub
parent a39a7a276d ff382d2029
commit 706cde4ffd
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/docs/content/docs/core/get-started/installation.mdx
View File

@@ -29,7 +29,7 @@ We have tested on the following Linux Distros:
### Providers ### Providers
- [Hostinger](https://www.hostinger.com/vps-hosting?ref=dokploy) Get 20% Discount using this referral link: [Referral Link](https://hostinger.com?REFERRALCODE=1SIUMAURICI97) - [Hostinger](https://www.hostinger.com/vps-hosting?ref=dokploy) Get 20% Discount using this referral link: [Referral Link](https://www.hostinger.com/vps-hosting?REFERRALCODE=1SIUMAURICI97)
- [DigitalOcean](https://www.digitalocean.com/pricing/droplets#basic-droplets) Get 200$ credits for free with this referral link: [Referral Link](https://m.do.co/c/db24efd43f35) - [DigitalOcean](https://www.digitalocean.com/pricing/droplets#basic-droplets) Get 200$ credits for free with this referral link: [Referral Link](https://m.do.co/c/db24efd43f35)
- [Hetzner](https://www.hetzner.com/cloud/) Get 20€ credits for free with this referral link: [Referral Link](https://hetzner.cloud/?ref=vou4fhxJ1W2D) - [Hetzner](https://www.hetzner.com/cloud/) Get 20€ credits for free with this referral link: [Referral Link](https://hetzner.cloud/?ref=vou4fhxJ1W2D)
- [Linode](https://www.linode.com/es/pricing/#compute-shared) - [Linode](https://www.linode.com/es/pricing/#compute-shared)

2
apps/dokploy/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "dokploy", "name": "dokploy",
"version": "v0.8.2", "version": "v0.8.3",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"type": "module", "type": "module",

2
apps/dokploy/server/api/routers/domain.ts
View File

@@ -27,7 +27,7 @@ export const domainRouter = createTRPCRouter({
.input(apiCreateDomain) .input(apiCreateDomain)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
try { try {
await createDomain(input); return await createDomain(input);
} catch (error) { } catch (error) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",

8
apps/dokploy/server/api/services/domain.ts
View File

@@ -14,7 +14,7 @@ import { findApplicationById } from "./application";
export type Domain = typeof domains.$inferSelect; export type Domain = typeof domains.$inferSelect;
export const createDomain = async (input: typeof apiCreateDomain._type) => { export const createDomain = async (input: typeof apiCreateDomain._type) => {
await db.transaction(async (tx) => { const result = await db.transaction(async (tx) => {
const domain = await tx const domain = await tx
.insert(domains) .insert(domains)
.values({ .values({
@@ -26,7 +26,7 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
if (!domain) { if (!domain) {
throw new TRPCError({ throw new TRPCError({
code: "BAD_REQUEST", code: "BAD_REQUEST",
message: "Error to create the domain", message: "Error creating domain",
}); });
} }
@@ -34,7 +34,11 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
const application = await findApplicationById(domain.applicationId); const application = await findApplicationById(domain.applicationId);
await manageDomain(application, domain); await manageDomain(application, domain);
} }
return domain;
}); });
return result;
}; };
export const generateTraefikMeDomain = async (appName: string) => { export const generateTraefikMeDomain = async (appName: string) => {

4
apps/dokploy/server/utils/builders/compose.ts
View File

@@ -53,6 +53,10 @@ Compose Type: ${composeType} ✅`;
}, },
{ {
cwd: projectPath, cwd: projectPath,
env: {
NODE_ENV: process.env.NODE_ENV,
PATH: process.env.PATH,
},
}, },
); );