mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
Merge branch 'canary' into 1345-domain-not-working-after-server-restart-or-traefik-reload
This commit is contained in:
@@ -73,15 +73,14 @@ export const ShowDeployments = ({ applicationId }: Props) => {
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex flex-col gap-4">
|
<div className="flex flex-col gap-4">
|
||||||
{deployments?.map((deployment) => (
|
{deployments?.map((deployment, index) => (
|
||||||
<div
|
<div
|
||||||
key={deployment.deploymentId}
|
key={deployment.deploymentId}
|
||||||
className="flex items-center justify-between rounded-lg border p-4 gap-2"
|
className="flex items-center justify-between rounded-lg border p-4 gap-2"
|
||||||
>
|
>
|
||||||
<div className="flex flex-col">
|
<div className="flex flex-col">
|
||||||
<span className="flex items-center gap-4 font-medium capitalize text-foreground">
|
<span className="flex items-center gap-4 font-medium capitalize text-foreground">
|
||||||
{deployment.status}
|
{index + 1}. {deployment.status}
|
||||||
|
|
||||||
<StatusTooltip
|
<StatusTooltip
|
||||||
status={deployment?.status}
|
status={deployment?.status}
|
||||||
className="size-2.5"
|
className="size-2.5"
|
||||||
|
|||||||
@@ -36,7 +36,15 @@
|
|||||||
"test": "vitest --config __test__/vitest.config.ts"
|
"test": "vitest --config __test__/vitest.config.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"ai": "^4.0.23",
|
||||||
|
"@ai-sdk/anthropic": "^1.0.6",
|
||||||
|
"@ai-sdk/azure": "^1.0.15",
|
||||||
|
"@ai-sdk/cohere": "^1.0.6",
|
||||||
|
"@ai-sdk/deepinfra": "^0.0.4",
|
||||||
|
"@ai-sdk/mistral": "^1.0.6",
|
||||||
"@ai-sdk/openai": "^1.0.12",
|
"@ai-sdk/openai": "^1.0.12",
|
||||||
|
"@ai-sdk/openai-compatible": "^0.0.13",
|
||||||
|
"ollama-ai-provider": "^1.1.0",
|
||||||
"better-auth": "1.2.0",
|
"better-auth": "1.2.0",
|
||||||
"bl": "6.0.11",
|
"bl": "6.0.11",
|
||||||
"rotating-file-stream": "3.2.3",
|
"rotating-file-stream": "3.2.3",
|
||||||
@@ -92,7 +100,6 @@
|
|||||||
"@xterm/xterm": "^5.4.0",
|
"@xterm/xterm": "^5.4.0",
|
||||||
"@xterm/addon-clipboard": "0.1.0",
|
"@xterm/addon-clipboard": "0.1.0",
|
||||||
"adm-zip": "^0.5.14",
|
"adm-zip": "^0.5.14",
|
||||||
"ai": "^4.0.23",
|
|
||||||
"bcrypt": "5.1.1",
|
"bcrypt": "5.1.1",
|
||||||
"bullmq": "5.4.2",
|
"bullmq": "5.4.2",
|
||||||
"class-variance-authority": "^0.7.0",
|
"class-variance-authority": "^0.7.0",
|
||||||
|
|||||||
@@ -306,7 +306,7 @@ const removeLastTenDeployments = async (
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (deploymentList.length > 10) {
|
if (deploymentList.length > 10) {
|
||||||
const deploymentsToDelete = deploymentList.slice(10);
|
const deploymentsToDelete = deploymentList.slice(9);
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
let command = "";
|
let command = "";
|
||||||
for (const oldDeployment of deploymentsToDelete) {
|
for (const oldDeployment of deploymentsToDelete) {
|
||||||
@@ -342,7 +342,7 @@ const removeLastTenComposeDeployments = async (
|
|||||||
if (deploymentList.length > 10) {
|
if (deploymentList.length > 10) {
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
let command = "";
|
let command = "";
|
||||||
const deploymentsToDelete = deploymentList.slice(10);
|
const deploymentsToDelete = deploymentList.slice(9);
|
||||||
for (const oldDeployment of deploymentsToDelete) {
|
for (const oldDeployment of deploymentsToDelete) {
|
||||||
const logPath = path.join(oldDeployment.logPath);
|
const logPath = path.join(oldDeployment.logPath);
|
||||||
|
|
||||||
@@ -354,7 +354,7 @@ const removeLastTenComposeDeployments = async (
|
|||||||
|
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, command);
|
||||||
} else {
|
} else {
|
||||||
const deploymentsToDelete = deploymentList.slice(10);
|
const deploymentsToDelete = deploymentList.slice(9);
|
||||||
for (const oldDeployment of deploymentsToDelete) {
|
for (const oldDeployment of deploymentsToDelete) {
|
||||||
const logPath = path.join(oldDeployment.logPath);
|
const logPath = path.join(oldDeployment.logPath);
|
||||||
if (existsSync(logPath)) {
|
if (existsSync(logPath)) {
|
||||||
@@ -376,7 +376,7 @@ export const removeLastTenPreviewDeploymenById = async (
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (deploymentList.length > 10) {
|
if (deploymentList.length > 10) {
|
||||||
const deploymentsToDelete = deploymentList.slice(10);
|
const deploymentsToDelete = deploymentList.slice(9);
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
let command = "";
|
let command = "";
|
||||||
for (const oldDeployment of deploymentsToDelete) {
|
for (const oldDeployment of deploymentsToDelete) {
|
||||||
|
|||||||
21
pnpm-lock.yaml
generated
21
pnpm-lock.yaml
generated
@@ -97,9 +97,27 @@ importers:
|
|||||||
|
|
||||||
apps/dokploy:
|
apps/dokploy:
|
||||||
dependencies:
|
dependencies:
|
||||||
|
'@ai-sdk/anthropic':
|
||||||
|
specifier: ^1.0.6
|
||||||
|
version: 1.0.8(zod@3.23.8)
|
||||||
|
'@ai-sdk/azure':
|
||||||
|
specifier: ^1.0.15
|
||||||
|
version: 1.0.18(zod@3.23.8)
|
||||||
|
'@ai-sdk/cohere':
|
||||||
|
specifier: ^1.0.6
|
||||||
|
version: 1.0.8(zod@3.23.8)
|
||||||
|
'@ai-sdk/deepinfra':
|
||||||
|
specifier: ^0.0.4
|
||||||
|
version: 0.0.4(zod@3.23.8)
|
||||||
|
'@ai-sdk/mistral':
|
||||||
|
specifier: ^1.0.6
|
||||||
|
version: 1.0.8(zod@3.23.8)
|
||||||
'@ai-sdk/openai':
|
'@ai-sdk/openai':
|
||||||
specifier: ^1.0.12
|
specifier: ^1.0.12
|
||||||
version: 1.0.16(zod@3.23.8)
|
version: 1.0.16(zod@3.23.8)
|
||||||
|
'@ai-sdk/openai-compatible':
|
||||||
|
specifier: ^0.0.13
|
||||||
|
version: 0.0.13(zod@3.23.8)
|
||||||
'@codemirror/lang-json':
|
'@codemirror/lang-json':
|
||||||
specifier: ^6.0.1
|
specifier: ^6.0.1
|
||||||
version: 6.0.1
|
version: 6.0.1
|
||||||
@@ -343,6 +361,9 @@ importers:
|
|||||||
octokit:
|
octokit:
|
||||||
specifier: 3.1.2
|
specifier: 3.1.2
|
||||||
version: 3.1.2
|
version: 3.1.2
|
||||||
|
ollama-ai-provider:
|
||||||
|
specifier: ^1.1.0
|
||||||
|
version: 1.1.0(zod@3.23.8)
|
||||||
otpauth:
|
otpauth:
|
||||||
specifier: ^9.2.3
|
specifier: ^9.2.3
|
||||||
version: 9.3.4
|
version: 9.3.4
|
||||||
|
|||||||
Reference in New Issue
Block a user