Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e013476
chore: update wordpress version to v6.7.1
vytenisstaugaitis Feb 12, 2025
6ea2a82
Create index.ts for Trilium app
jeffersoncbd Feb 13, 2025
6688b14
Create docker-compose.yml
jeffersoncbd Feb 13, 2025
2c65fc2
Update templates.ts
jeffersoncbd Feb 13, 2025
9de3bf3
Add files via upload
jeffersoncbd Feb 13, 2025
2090292
Merge pull request #1307 from vytenisstaugaitis/canary
Siumauricio Feb 13, 2025
d9c83b7
docs(template): note on networking for superset
nktnet1 Feb 13, 2025
bbdda01
feat(template): update plausible
mezotv Feb 13, 2025
bf6c269
fix: update plausible version
mezotv Feb 13, 2025
ed54df9
feat(template): add convex.dev
mafrasil Feb 14, 2025
796e50e
feat(template): add outline
drudge Feb 15, 2025
9ace0f3
chore(lint): fix lint
drudge Feb 15, 2025
e7195c8
Update apps/dokploy/templates/trilium/docker-compose.yml
Siumauricio Feb 15, 2025
2b5a1d9
Merge pull request #1309 from jeffersoncbd/canary
Siumauricio Feb 15, 2025
12034e4
Merge pull request #1316 from mezotv/patch-2
Siumauricio Feb 15, 2025
fd69b45
refactor: update envs
Siumauricio Feb 15, 2025
3b1ade8
style(monitoring): use status badges for compose monitoring
drudge Feb 15, 2025
f38fb96
Merge branch 'canary' into feat-add-convex-tpl
Siumauricio Feb 15, 2025
8366219
refactor: format
Siumauricio Feb 15, 2025
64bdf07
Merge pull request #1319 from mafrasil/feat-add-convex-tpl
Siumauricio Feb 15, 2025
ba54124
Merge pull request #1321 from drudge/templates/outline
Siumauricio Feb 15, 2025
2ddfc83
Merge pull request #1322 from drudge/ui/compose-monitoring-status
Siumauricio Feb 15, 2025
23b5907
refactor: add missing path option
Siumauricio Feb 15, 2025
3a7bb50
Merge pull request #1324 from Dokploy/1320-missing-path-option-when-a…
Siumauricio Feb 15, 2025
871931b
fix: handle race condition to catch recreation base containers
Siumauricio Feb 15, 2025
71a007a
Merge pull request #1325 from Dokploy/1257-main-server-error-error-ht…
Siumauricio Feb 15, 2025
450302b
fix: inherit security & redirects from application
Siumauricio Feb 15, 2025
71c609d
Merge pull request #1326 from Dokploy/1304-preview-deployments-dont-w…
Siumauricio Feb 15, 2025
0baf9d8
feat(template): add Appwrite
Feb 15, 2025
9ca3ab3
Merge pull request #1327 from Krobys/canary
Siumauricio Feb 15, 2025
2ebb02d
feat(template): add docker registry template
drudge Feb 16, 2025
48c4ec5
fix(template): switch outline to png for dark mode
drudge Feb 16, 2025
c78b8cf
Update package.json
Siumauricio Feb 17, 2025
b1502f5
Merge pull request #1329 from drudge/templates/registry
Siumauricio Feb 17, 2025
56af894
Merge pull request #1313 from nktnet1/superset-networks
Siumauricio Feb 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { badgeStateColor } from "@/components/dashboard/application/logs/show";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Card,
Expand Down Expand Up @@ -96,7 +98,10 @@ export const ComposeFreeMonitoring = ({
key={container.containerId}
value={container.name}
>
{container.name} ({container.containerId}) {container.state}
{container.name} ({container.containerId}){" "}
<Badge variant={badgeStateColor(container.state)}>
{container.state}
</Badge>
</SelectItem>
))}
<SelectLabel>Containers ({data?.length})</SelectLabel>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { badgeStateColor } from "@/components/dashboard/application/logs/show";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Card,
Expand Down Expand Up @@ -102,7 +104,9 @@ export const ComposePaidMonitoring = ({
value={container.name}
>
{container.name} ({container.containerId}){" "}
{container.state}
<Badge variant={badgeStateColor(container.state)}>
{container.state}
</Badge>
</SelectItem>
))}
<SelectLabel>Containers ({data?.length})</SelectLabel>
Expand Down
2 changes: 1 addition & 1 deletion apps/dokploy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dokploy",
"version": "v0.18.3",
"version": "v0.18.4",
"private": true,
"license": "Apache-2.0",
"type": "module",
Expand Down
4 changes: 2 additions & 2 deletions apps/dokploy/pages/dashboard/project/[projectId].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ import type {
} from "next";
import Head from "next/head";
import { useRouter } from "next/router";
import { useMemo, useState, type ReactElement } from "react";
import superjson from "superjson";
import { type ReactElement, useMemo, useState } from "react";
import { toast } from "sonner";
import superjson from "superjson";

export type Services = {
appName: string;
Expand Down
9 changes: 9 additions & 0 deletions apps/dokploy/public/templates/appwrite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions apps/dokploy/public/templates/convex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/dokploy/public/templates/outline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/dokploy/public/templates/registry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/dokploy/public/templates/trilium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading