Merge remote-tracking branch 'origin/v4.x' into next

ShadowArcanist · ShadowArcanist · commit ac96af083cc1 · 2025-05-11T17:07:26.000+05:30
diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
@@ -3,7 +3,7 @@ name: Production Build
 on:
   push:
     branches:
-      - main
+      - v4.x
 
 env:
   GITHUB_REGISTRY: ghcr.io
@@ -21,7 +21,7 @@ jobs:
           version: latest
           buildkitd-flags: --debug
 
-      - uses: actions/cache@v4.2.0
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.bun/install/cache
diff --git a/.github/workflows/staging-build.yml b/.github/workflows/staging-build.yml
@@ -21,7 +21,7 @@ jobs:
           version: latest
           buildkitd-flags: --debug
 
-      - uses: actions/cache@v4.2.0
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.bun/install/cache
diff --git a/.github/workflows/update-trieve.yml b/.github/workflows/update-trieve.yml
@@ -7,7 +7,7 @@ concurrency:
 on:
   push:
     branches:
-      - main
+      - v4.x
 
 jobs:
   run:
@@ -16,8 +16,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
       - name: Install Trieve Vitepress Adapter
-        run: npm install -g trieve-vitepress-adapter
+        run: bun install -g trieve-vitepress-adapter
 
       - name: Update Trieve Chunks
         env:
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2024] [Andras Bacsai]
+   Copyright [2025] [Andras Bacsai]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bun.lockb b/bun.lockb
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
@@ -3,7 +3,7 @@ import yaml from 'vite-plugin-yaml'
 import llmstxt from 'vitepress-plugin-llms'
 import { defineConfig } from 'vitepress'
 import { useSidebar } from 'vitepress-openapi'
-import spec from '../public/openapi.json' with { type: 'json' }
+import spec from './theme/openapi.json' with { type: 'json' }
 import container from 'markdown-it-container'
 import { bundledLanguages } from 'shiki'
 import { join, dirname } from 'node:path'
@@ -50,7 +50,7 @@ export default defineConfig({
     ['meta', { property: 'twitter:url', content: 'https://coolify.io/docs/' }],
     ['meta', { property: 'twitter:image', content: 'https://coolcdn.b-cdn.net/assets/coolify/og-image-docs.png' }],
     ['link', { rel: 'icon', href: '/docs/coolify-logo-transparent.png' }],
-    ['link', { rel: 'icon', type: 'image/x-icon', href: '/docs/public/favicon.ico' }],
+    ['link', { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
     ['script', { defer: 'true', src: 'https://analytics.coollabs.io/js/script.tagged-events.js', 'data-domain': env.VITE_ANALYTICS_DOMAIN ?? 'coolify.io/docs' }],
     ['script', { async: 'true', src: '/docs/trieve-user-script.js' }],
   ],
@@ -84,7 +84,7 @@ export default defineConfig({
 
     socialLinks: [
       { icon: 'github', link: 'https://github.com/coollabsio/coolify' },
-      { icon: 'discord', link: 'https://discord.gg/coolify' },
+      { icon: 'discord', link: 'https://coollabs.io/discord' },
       { icon: 'x', link: 'https://x.com/coolifyio' }
     ],
 
@@ -550,6 +550,7 @@ export default defineConfig({
             items: [
               { text: 'Inaccessible ', link: '/troubleshoot/dashboard/dashboard-inaccessible' },
               { text: 'Very Slow ', link: '/troubleshoot/dashboard/dashboard-slow-performance' },
+              { text: 'Disable 2FA Manually', link: '/troubleshoot/dashboard/disable-2fa-manually' },
             ]
           },
           {
diff --git a/docs/.vitepress/theme/index.ts b/docs/.vitepress/theme/index.ts
@@ -23,7 +23,7 @@ import 'virtual:group-icons.css'
 import { enhanceAppWithTabs } from "vitepress-plugin-tabs/client";
 
 // @ts-ignore
-import spec from "../../public/openapi.json" assert { type: "json" };
+import spec from "./openapi.json" assert { type: "json" };
 
 // Import components
 import Card from "./components/Card.vue";
diff --git a/docs/.vitepress/theme/openapi.json b/docs/.vitepress/theme/openapi.json
diff --git a/docs/api-reference/api/index.md b/docs/api-reference/api/index.md
@@ -9,4 +9,4 @@ toc: false
 
 ## Need help?
 
-If you need help with the API please get in touch with us on [Discord](https://discord.gg/coolify).
+If you need help with the API please get in touch with us on [Discord](https://coollabs.io/discord).
diff --git a/docs/api-reference/api/operations/[operation].paths.ts b/docs/api-reference/api/operations/[operation].paths.ts
@@ -1,4 +1,4 @@
-import spec from '../../../public/openapi.json' with { type: 'json' }
+import spec from '../../../.vitepress/theme/openapi.json' with { type: 'json' }
 
 export default {
   async paths() {
diff --git a/docs/applications/laravel.md b/docs/applications/laravel.md
@@ -137,10 +137,10 @@ group = www-data
 listen.owner = www-data
 listen.group = www-data
 pm = dynamic
-pm.max_children = 50 # To reduce memory/CPU usage, change to 5.
-pm.min_spare_servers = 4 # To reduce memory/CPU usage, change to 1.
-pm.max_spare_servers = 32 # To reduce memory/CPU usage, change to 3.
-pm.start_servers = 18 # To reduce memory/CPU usage, change to 2.
+pm.max_children = 50
+pm.min_spare_servers = 4
+pm.max_spare_servers = 32
+pm.start_servers = 18
 clear_env = no
 php_admin_value[post_max_size] = 35M
 php_admin_value[upload_max_filesize] = 30M
diff --git a/docs/builds/packs/docker-compose.md b/docs/builds/packs/docker-compose.md
@@ -22,7 +22,7 @@ On the Coolify dashboard, open your project and click the **Create New Resource*
 
 **A.** If your Git repository is public, choose the **Public Repository** option.
 
-**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/github-app) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
+**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/integration#with-github-app-recommended) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
 
 
 ### 3. Select Your Git Repository
@@ -63,11 +63,6 @@ services:
 <ZoomableImage src="/docs/images/builds/packs/compose/6.webp" />
 
 ### Coolify's Magic Environment Variables
-::: warning HEADS UP!
-As of Coolify v4.0.0-beta.410, Magic Environment Variables are only supported for One-Click Services and Docker Compose-based deployments. 
-
-This means that Git-based Docker Compose deployments are not yet supported. The team is actively working on adding support in future releases of Coolify.
-:::
 
 Coolify can generate dynamic environment variables for you using the following syntax: `SERVICE_<TYPE>_<IDENTIFIER>`. 
 
diff --git a/docs/builds/packs/dockerfile.md b/docs/builds/packs/dockerfile.md
@@ -24,7 +24,7 @@ On the Coolify dashboard, open your project and click the **Create New Resource*
 
 **A.** If your Git repository is public, choose the **Public Repository** option.
 
-**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/github-app) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
+**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/integration#with-github-app-recommended) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
 
 
 ### 3. Select Your Git Repository
diff --git a/docs/builds/packs/nixpacks.md b/docs/builds/packs/nixpacks.md
@@ -27,7 +27,7 @@ On Coolify dashboard open your project and click the **Create New Resource** but
 
 **A.** If your Git repository is public, choose the **Public Repository** option.
 
-**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/github-app) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
+**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/integration#with-github-app-recommended) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
 
 
 ### 3. Select Your Git Repository
diff --git a/docs/builds/packs/static.md b/docs/builds/packs/static.md
@@ -31,7 +31,7 @@ On Coolify dashboard open your project and click the **Create New Resource** but
 
 **A.** If your Git repository is public, choose the **Public Repository** option.
 
-**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/github-app) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
+**B.** If your repository is private, you can select **Github App** or **Deploy Key**. (These methods require extra configuration. You can check the guides on setting up a [Github App ↗](/knowledge-base/git/github/integration#with-github-app-recommended) or [Deploy Key ↗](/knowledge-base/git/github/integration#with-deploy-keys) if needed.)
 
 
 ### 4. Select Your Git Repository
diff --git a/docs/get-started/introduction.md b/docs/get-started/introduction.md
@@ -85,5 +85,5 @@ You have two ways to use Coolify:
 
 
 ## Join Our Community
-Got questions or need support? Our [discord community](https://discord.gg/coolify) is here to help. 
+Got questions or need support? Our [discord community](https://coollabs.io/discord) is here to help. 
 Connect with other Coolify users on our community server to get assistance and share your experiences.
diff --git a/docs/get-started/support.md b/docs/get-started/support.md
@@ -9,7 +9,7 @@ title: Support
 ## Community Support  
 Join our [Discord community ↗](https://coollabs.io/discord) with over **13K members**, where you can create a post in the **support forum channel** for assistance. 
 
-While the community does provide some help, the [Coolify Core team ↗](/resource/team) is actively involved in the forum to ensure questions are addressed.  
+While the community does provide some help, the [Core team ↗](/get-started/team) is actively involved in the forum to ensure questions are addressed.  
 
 ## Direct Support from Core Developers
 If you are a **Coolify Cloud user**, you can reach out via email at **hi@coollabs.io** for direct support from [Andras (Coolify’s founder)](https://x.com/heyandras). Since he personally handles emails, response times may be delayed. 
diff --git a/docs/get-started/team.md b/docs/get-started/team.md
@@ -76,7 +76,7 @@ const coreMembers = [
 <VPTeamPage>
   <VPTeamPageTitle>
     <template #title>
-      CoolLabs Team
+      coolLabs Team
     </template>
     <template #lead>
       The development of Coolify is guided by an international team, some of whom have chosen to be featured below.
diff --git a/docs/knowledge-base/proxy/caddy/overview.md b/docs/knowledge-base/proxy/caddy/overview.md
@@ -23,7 +23,7 @@ While [Traefik ↗](https://traefik.io/) is the default reverse proxy used in Co
 ## A Note from the Coolify Team  
 While Caddy is a fantastic tool for certain use cases, **we highly recommend** using **Traefik** over Caddy for most Coolify setups. 
 
-The [Core team](/resource/team) primarily uses Traefik, and it is the default reverse proxy configured within Coolify.  
+The [Core team](/get-started/team) primarily uses Traefik, and it is the default reverse proxy configured within Coolify.  
 
 Only consider using Caddy if you're familiar with it or need specific features that Traefik cannot provide.  
 
diff --git a/docs/resource/changelog/v4-beta-383.md b/docs/resource/changelog/v4-beta-383.md
@@ -41,4 +41,4 @@ We've improved the deployment logs to provide more detailed information, making
 ---
 
 
-If you encounter any bugs, feel free to [report them](https://github.com/coollabsio/coolify/issues), and we’ll work on fixing them in the next update. Join our [Discord community](https://discord.gg/coolify) to share your thoughts and feedback on this release!
+If you encounter any bugs, feel free to [report them](https://github.com/coollabsio/coolify/issues), and we’ll work on fixing them in the next update. Join our [Discord community](https://coollabs.io/discord) to share your thoughts and feedback on this release!
diff --git a/docs/troubleshoot/dashboard/disable-2fa-manually.md b/docs/troubleshoot/dashboard/disable-2fa-manually.md
@@ -0,0 +1,49 @@
+---
+title: Disable 2FA Manually
+---
+
+# Disable 2FA Manually
+
+If you have lost your 2FA device or have any other issues, you can disable 2FA manually if you have access to your server.
+
+## 1. Login to your server through SSH
+
+```bash
+ssh your-server-ip
+```
+
+## 2. Run the following command to go into coolify container
+
+```bash
+docker exec -it coolify sh
+```
+
+## 3. Go into Tinker
+
+```bash
+php artisan tinker
+```
+
+## 4. Find your user id
+
+> In case of `root` user, you must use `0` as user id.
+
+
+> So `$user_id = 0`;
+
+
+> For every other user, use the below command to get the user id.
+
+```php
+$user_id = User::whereEmail('your-email')->first()->id;
+```
+
+## 5. Disable 2FA
+
+```php
+User::find($user_id)->update([
+  'two_factor_secret' => null,
+  'two_factor_recovery_codes' => null,
+  'two_factor_confirmed_at' => null
+]);
+```
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@vueuse/core": "12.5.0",
     "globe.gl": "2.39.7",
-    "vitepress-openapi": "0.0.3-alpha.75"
+    "vitepress-openapi": "0.0.3-alpha.78"
   },
   "packageManager": "pnpm@10.6.3+sha512.bb45e34d50a9a76e858a95837301bfb6bd6d35aea2c5d52094fa497a467c43f5c440103ce2511e9e0a2f89c3d6071baac3358fc68ac6fb75e2ceb3d2736065e6"
 }

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@ toc: false`
`9`	`9`
`10`	`10`	`## Need help?`
`11`	`11`
`12`		`-If you need help with the API please get in touch with us on [Discord](https://discord.gg/coolify).`
	`12`	`+If you need help with the API please get in touch with us on [Discord](https://coollabs.io/discord).`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import spec from '../../../public/openapi.json' with { type: 'json' }`
	`1`	`+import spec from '../../../.vitepress/theme/openapi.json' with { type: 'json' }`
`2`	`2`
`3`	`3`	`export default {`
`4`	`4`	`async paths() {`