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

fix: resolved merge conflicts with fork/canary

Browse Source
This commit is contained in:
Jason Parks
2025-03-16 03:02:15 -06:00
parent 027406547e 9ac68985e0
commit ea39b152f4
502 changed files with 18288 additions and 16475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dokploy/drizzle/0071_flaky_black_queen.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "user_temp" ADD COLUMN "logCleanupCron" text;

2
apps/dokploy/drizzle/0072_green_susan_delgado.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TYPE "public"."certificateType" ADD VALUE 'custom';--> statement-breakpoint
ALTER TABLE "domain" ADD COLUMN "customCertResolver" text;--> statement-breakpoint

1
apps/dokploy/drizzle/0073_hot_domino.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "application" ADD COLUMN "previewCertificateProvider" text;

1
apps/dokploy/drizzle/0074_black_quasar.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "application" RENAME COLUMN "previewCertificateProvider" TO "previewCustomCertResolver";

1
apps/dokploy/drizzle/0075_young_typhoid_mary.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "application" ADD COLUMN "watchPaths" text[];

1
apps/dokploy/drizzle/0076_young_sharon_ventura.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "compose" ADD COLUMN "watchPaths" text[];

1
apps/dokploy/drizzle/0077_chemical_dreadnoughts.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "backup" ADD COLUMN "keepLatestCount" integer;

9
apps/dokploy/drizzle/meta/0072_snapshot.json
View File

@@ -924,6 +924,12 @@
"notNull": true,
"default": false
},
"logCleanupCron": {
"name": "logCleanupCron",
"type": "text",
"primaryKey": false,
"notNull": false
},
"enablePaidFeatures": {
"name": "enablePaidFeatures",
"type": "boolean",
@@ -5205,7 +5211,8 @@
"schema": "public",
"values": [
"letsencrypt",
"none"
"none",
"custom"
]
},
"public.composeType": {

21
apps/dokploy/drizzle/meta/0073_snapshot.json
View File

@@ -85,6 +85,12 @@
"notNull": true,
"default": "'none'"
},
"previewCertificateProvider": {
"name": "previewCertificateProvider",
"type": "text",
"primaryKey": false,
"notNull": false
},
"previewLimit": {
"name": "previewLimit",
"type": "integer",
@@ -924,6 +930,12 @@
"notNull": true,
"default": false
},
"logCleanupCron": {
"name": "logCleanupCron",
"type": "text",
"primaryKey": false,
"notNull": false
},
"enablePaidFeatures": {
"name": "enablePaidFeatures",
"type": "boolean",
@@ -1128,6 +1140,12 @@
"primaryKey": false,
"notNull": false
},
"customCertResolver": {
"name": "customCertResolver",
"type": "text",
"primaryKey": false,
"notNull": false
},
"applicationId": {
"name": "applicationId",
"type": "text",
@@ -5193,7 +5211,8 @@
"schema": "public",
"values": [
"letsencrypt",
"none"
"none",
"custom"
]
},
"public.composeType": {

21
apps/dokploy/drizzle/meta/0074_snapshot.json
View File

@@ -85,6 +85,12 @@
"notNull": true,
"default": "'none'"
},
"previewCustomCertResolver": {
"name": "previewCustomCertResolver",
"type": "text",
"primaryKey": false,
"notNull": false
},
"previewLimit": {
"name": "previewLimit",
"type": "integer",
@@ -924,6 +930,12 @@
"notNull": true,
"default": false
},
"logCleanupCron": {
"name": "logCleanupCron",
"type": "text",
"primaryKey": false,
"notNull": false
},
"enablePaidFeatures": {
"name": "enablePaidFeatures",
"type": "boolean",
@@ -1128,6 +1140,12 @@
"primaryKey": false,
"notNull": false
},
"customCertResolver": {
"name": "customCertResolver",
"type": "text",
"primaryKey": false,
"notNull": false
},
"applicationId": {
"name": "applicationId",
"type": "text",
@@ -5217,7 +5235,8 @@
"schema": "public",
"values": [
"letsencrypt",
"none"
"none",
"custom"
]
},
"public.composeType": {

27
apps/dokploy/drizzle/meta/0075_snapshot.json
View File

@@ -44,6 +44,12 @@
"primaryKey": false,
"notNull": false
},
"watchPaths": {
"name": "watchPaths",
"type": "text[]",
"primaryKey": false,
"notNull": false
},
"previewBuildArgs": {
"name": "previewBuildArgs",
"type": "text",
@@ -85,6 +91,12 @@
"notNull": true,
"default": "'none'"
},
"previewCustomCertResolver": {
"name": "previewCustomCertResolver",
"type": "text",
"primaryKey": false,
"notNull": false
},
"previewLimit": {
"name": "previewLimit",
"type": "integer",
@@ -924,6 +936,12 @@
"notNull": true,
"default": false
},
"logCleanupCron": {
"name": "logCleanupCron",
"type": "text",
"primaryKey": false,
"notNull": false
},
"enablePaidFeatures": {
"name": "enablePaidFeatures",
"type": "boolean",
@@ -1128,6 +1146,12 @@
"primaryKey": false,
"notNull": false
},
"customCertResolver": {
"name": "customCertResolver",
"type": "text",
"primaryKey": false,
"notNull": false
},
"applicationId": {
"name": "applicationId",
"type": "text",
@@ -5254,7 +5278,8 @@
"schema": "public",
"values": [
"letsencrypt",
"none"
"none",
"custom"
]
},
"public.composeType": {

5150
apps/dokploy/drizzle/meta/0076_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

5156
apps/dokploy/drizzle/meta/0077_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff