Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/remove build on server #591

Merged
merged 44 commits into from
Oct 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
988357f
refactor: update payments
Siumauricio Oct 18, 2024
e32b713
Merge branch 'canary' into feat/payments
Siumauricio Oct 18, 2024
2d40b2d
feat: add stripe integration
Siumauricio Oct 18, 2024
319584d
Merge branch 'canary' into feat/payments
Siumauricio Oct 19, 2024
fe0a662
feat(cloud): add billing wip
Siumauricio Oct 20, 2024
ffe7b04
feat: add stripe webhooks
Siumauricio Oct 20, 2024
1907e7e
feat: add webhook
Siumauricio Oct 21, 2024
fbda00f
refactor: update webhooks and added validation to prevent deploy when…
Siumauricio Oct 21, 2024
9591fbf
refactor: add Is cloud flag
Siumauricio Oct 21, 2024
626cfb8
refactor: add website url redirect
Siumauricio Oct 21, 2024
4685ef7
refactor: update stripe envs
Siumauricio Oct 21, 2024
03f923c
refactor: update show servers
Siumauricio Oct 21, 2024
255e9e4
refactor: remove dokploy restart on notifications
Siumauricio Oct 21, 2024
53edf06
refactor: remove comments
Siumauricio Oct 21, 2024
c0afcaf
refactor: show banner when the server is disabled
Siumauricio Oct 21, 2024
9bace8e
refactor: clean stripe customer if the customer is deleted
Siumauricio Oct 21, 2024
49ee8ce
Merge branch 'canary' into feat/payments
Siumauricio Oct 22, 2024
22e42b6
feat: add is cloud in ssr
Siumauricio Oct 22, 2024
431dadb
feat: add pricing
Siumauricio Oct 22, 2024
1e6dbb5
feat(dokploy): add reset password for cloud
Siumauricio Oct 22, 2024
548df8c
Merge branch 'canary' into feat/payments
Siumauricio Oct 23, 2024
017bdd2
refactor(dokploy): add flag to prevent run commands when is cloud
Siumauricio Oct 23, 2024
975d13c
refactor(dokploy): disable stats monitoring
Siumauricio Oct 23, 2024
c1f777e
refactor: remove serverIp
Siumauricio Oct 23, 2024
7e76eb4
refactor: delete log
Siumauricio Oct 23, 2024
dfdedf9
chore(dokploy): simplify migrations
Siumauricio Oct 23, 2024
6c7c919
refactor: set servers quantity in 0 when the subscription is created
Siumauricio Oct 24, 2024
e15d41f
chore: add radix tabs
Siumauricio Oct 24, 2024
647a5d0
test(dokploy): add missing fields
Siumauricio Oct 24, 2024
bcc7afa
refactor(dokploy): fix ts errors
Siumauricio Oct 24, 2024
fa053b4
refactor(dokploy): remove stripe from global scope
Siumauricio Oct 24, 2024
cb586c9
Merge branch 'canary' into feat/payments
Siumauricio Oct 24, 2024
47aa223
refactor: remove save on build on next app and integrate turbopack
Siumauricio Oct 25, 2024
c42f5cb
refactor: update
Siumauricio Oct 25, 2024
4911134
chore: remove server build
Siumauricio Oct 25, 2024
fbada4c
chore: set right filter pnpm dockerfile
Siumauricio Oct 25, 2024
484ead1
chore: update workflows
Siumauricio Oct 25, 2024
054836f
chore: update workflows
Siumauricio Oct 25, 2024
5df7654
chore: update imports
Siumauricio Oct 25, 2024
7f94593
chore: revert ci/cd
Siumauricio Oct 25, 2024
af3b1a2
refactor: update tests
Siumauricio Oct 25, 2024
83d52b6
refactor: update
Siumauricio Oct 25, 2024
60d4e1b
chore: update dockerfiles
Siumauricio Oct 25, 2024
303d1b1
chore: add missing command
Siumauricio Oct 25, 2024
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
Prev Previous commit
Next Next commit
refactor: add Is cloud flag
  • Loading branch information
Siumauricio committed Oct 21, 2024
commit 9591fbff084536e593c151d95c4928429321d20e
14 changes: 9 additions & 5 deletions apps/dokploy/server/api/routers/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,16 @@ export const serverRouter = createTRPCRouter({
const currentServer = await findServerById(input.serverId);
await removeDeploymentsByServerId(currentServer);
await deleteServer(input.serverId);
const admin = await findAdminById(ctx.user.adminId);

await updateServersBasedOnQuantity(
admin.adminId,
admin.serversQuantity,
);
if (IS_CLOUD) {
const admin = await findAdminById(ctx.user.adminId);

await updateServersBasedOnQuantity(
admin.adminId,
admin.serversQuantity,
);
}

return currentServer;
} catch (error) {
throw error;
Expand Down