Merge branch 'canary' into 139-multi-server-feature

This commit is contained in:
Mauricio Siu
2024-09-21 22:52:44 -06:00
9 changed files with 137 additions and 27 deletions

BIN
.github/sponsors/lxaer.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 KiB

View File

@@ -1,8 +1,8 @@
<div align="center">
<h1 align="center">Dokploy</h1>
<div>
<img style="object-fit: cover;" align="center" width="100%"src=".github/sponsors/logo.png" >
<a href="https://dokploy.com" target="_blank" rel="noopener">
<img style="object-fit: cover;" align="center" width="100%"src=".github/sponsors/logo.png" alt="Dokploy - Open Source Alternative to Vercel, Heroku and Netlify." />
</a>
</div>
</br>

View File

@@ -3,7 +3,6 @@ title: Installation
description: "Get Dokploy up and running on your server within minutes with this easy-to-follow installation guide."
---
Follow these steps in order to set up Dokploy locally and deploy it to your server, effectively managing Docker containers and applications:
You need to follow this steps in the same order:
@@ -30,8 +29,9 @@ We have tested on the following Linux Distros:
### Providers
- [DigitalOcean](https://www.digitalocean.com/pricing/droplets#basic-droplets)
- [Hetzner](https://www.hetzner.com/cloud/)
- [Hostinger](https://www.hostinger.com/vps-hosting?ref=dokploy) Get 20% Discount using this referral link: [Referral Link](https://hostinger.com?REFERRALCODE=1SIUMAURICI97)
- [DigitalOcean](https://www.digitalocean.com/pricing/droplets#basic-droplets) Get 200$ credits for free with this referral link: [Referral Link](https://m.do.co/c/db24efd43f35)
- [Hetzner](https://www.hetzner.com/cloud/) Get 20€ credits for free with this referral link: [Referral Link](https://hetzner.cloud/?ref=vou4fhxJ1W2D)
- [Linode](https://www.linode.com/es/pricing/#compute-shared)
- [Vultr](https://www.vultr.com/pricing/#cloud-compute)
- [Scaleway](https://www.scaleway.com/en/pricing/?tags=baremetal,available)
@@ -42,11 +42,12 @@ We have tested on the following Linux Distros:
To ensure a smooth experience with Dokploy, your server should have at least 2GB of RAM and 30GB of disk space. This specification helps to handle the resources consumed by Docker during builds and prevents system freezes.
import { Callout } from "fumadocs-ui/components/callout";
import { Callout } from 'fumadocs-ui/components/callout';
<Callout>**Suggestion:** For cost efficiency with reliable service, we recommend Hetzner as the best value-for-money VPS provider.</Callout>
<Callout>
**Suggestion:** For cost efficiency with reliable service, we recommend
Hetzner as the best value-for-money VPS provider.
</Callout>
### Docker
@@ -64,9 +65,16 @@ After running the installation script, Dokploy and its dependencies will be set
Open your web browser and navigate to `http://your-ip-from-your-vps:3000`. You will be directed to the initial setup page where you can configure the administrative account for Dokploy.
### Initial Configuration
1. **Create an Admin Account:** Fill in the necessary details to set up your administrator account. This account will be the admin account for Dokploy.
<ImageZoom src="/assets/images/setup.png" width={1300} height={650} alt='home og image' className="rounded-lg" />
{" "}
<ImageZoom
src="/assets/images/setup.png"
width={1300}
height={650}
alt="home og image"
className="rounded-lg"
/>

View File

@@ -19,7 +19,6 @@ description: Deploy open source templates with Dokploy
- **AppSmith**: 开源的 CRM 替代方案
- **Meilisearch**: 一个快速的搜索 API轻松集成到您的应用、网站和工作流中
- **Odoo**: 开源的 ERP 替代方案
- **Plausible**: 开源分析平台
- **Rocketchat**: 开源的聊天平台
- **Uptime Kuma**: 开源的运行时间监控
- **PhpMyAdmin**: 开源数据库管理
@@ -28,9 +27,7 @@ description: Deploy open source templates with Dokploy
- **excalidraw**: 开源协作绘图工具
- **Directus**: 现代数据栈 🐰 — Directus 是一个即时的 REST+GraphQL API 和直观的无代码数据协作应用程序,适用于任何 SQL 数据库
- **Baserow**: 构建管理面板、内部工具和仪表板的平台
- **Minio**: 开源对象存储
- **Metabase**: 开源商业智能
- **Grafana**: 开源的指标仪表板
- **Wordpress**: 开源内容管理系统
## 创建您自己的模板

View File

@@ -19,7 +19,6 @@ The following templates are available:
- **AppSmith**: Open Source CRM Alternative
- **Meilisearch**: A lightning-fast search API that fits effortlessly into your apps, websites, and workflow
- **Odoo**: Open Source ERP Alternative
- **Plausible**: Open source analytics platform
- **Rocketchat**: Open Source Chat Platform
- **Uptime Kuma**: Open Source Uptime Monitoring
- **PhpMyAdmin**: Open Source Database Administration
@@ -28,9 +27,7 @@ The following templates are available:
- **excalidraw**: Open Source Collaborative Drawing Tool
- **Directus**: The Modern Data Stack 🐰 — Directus is an instant REST+GraphQL API and intuitive no-code data collaboration app for any SQL database.
- **Baserow**: Platform to build admin panels, internal tools, and dashboards
- **Minio**: Open Source Object Storage
- **Metabase**: Open Source Business Intelligence
- **Grafana**: Open Source Dashboard for your metrics
- **Wordpress**: Open Source Content Management System
- **Open WebUI**: Free and Open Source ChatGPT Alternative
- **Teable**: Open Source Airtable Alternative, Developer Friendly, No-code Database Built on Postgres

View File

@@ -253,7 +253,7 @@ export const AddTemplate = ({ projectId }: Props) => {
</Link>
)}
<Link
href={`https://github.com/dokploy/dokploy/tree/canary/templates/${template.id}`}
href={`https://github.com/Dokploy/dokploy/tree/canary/apps/dokploy/templates/${template.id}`}
target="_blank"
className={
"text-sm text-muted-foreground p-3 rounded-full hover:bg-border items-center flex transition-colors"

View File

@@ -63,8 +63,8 @@ export const ShowProjects = () => {
project?.mysql.length === 0 &&
project?.postgres.length === 0 &&
project?.redis.length === 0 &&
project?.applications.length === 0;
project?.compose.length === 0;
project?.applications.length === 0 &&
project?.compose.length === 0;
const totalServices =
project?.mariadb.length +

View File

@@ -326,7 +326,7 @@ export const templates: TemplateData[] = [
description: "Glitchtip is simple, open source error tracking",
logo: "glitchtip.png",
links: {
github: "https://github.com/glitchtip/glitchtip",
github: "https://gitlab.com/glitchtip/",
website: "https://glitchtip.com/",
docs: "https://glitchtip.com/documentation",
},

View File

@@ -142,8 +142,8 @@ export function Hero() {
</div>
<div className="mt-16 flex flex-row justify-center gap-x-8 rounded-lg sm:gap-x-0 sm:gap-y-10 xl:gap-x-12 xl:gap-y-0">
<iframe
width="560"
height="315"
width="460"
height="215"
src="https://www.youtube-nocookie.com/embed/mznYKPvhcfw?si=vHvqP3HKy0V3XkOZ"
title="YouTube video player"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
@@ -152,8 +152,8 @@ export function Hero() {
className="rounded-xl"
/>
</div>
<div className="mt-16">
<ShowSponsors />
{/* <div className="mt-16">
<p className="font-display text-base text-primary">
{t("hero.featuredIn")}
</p>
@@ -175,8 +175,116 @@ export function Hero() {
</li>
))}
</ul>
</div>
</div> */}
</div>
</Container>
);
}
export const ShowSponsors = () => {
return (
<div className="mt-20 flex flex-col justify-center gap-y-10">
<div className="flex flex-col gap-4 justify-start">
<h1 className="mx-auto max-w-2xl font-display text-3xl font-medium tracking-tight text-primary sm:text-5xl">
Sponsors
</h1>
<p className="mx-auto max-w-2xl text-lg tracking-tight text-muted-foreground">
Dokploy is an open source project that is maintained by a community of
volunteers. We would like to thank our sponsors for their support and
contributions to the project, which help us to continue to develop and
improve Dokploy.
</p>
</div>
<div className="flex flex-col gap-4 md:gap-6 justify-start">
<h2 className="font-display text-2xl font-medium tracking-tight text-primary sm:text-2xl text-left">
Hero Sponsors 🎖
</h2>
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
<a href="https://www.hostinger.com/vps-hosting?ref=dokploy">
<img
src="https://raw.githubusercontent.com/Dokploy/dokploy/canary/.github/sponsors/hostinger.jpg"
alt="hostinger.com"
className="rounded-xl"
width="200"
/>
</a>
<a href="https://www.lxaer.com?ref=dokploy">
<img
src="https://raw.githubusercontent.com/Dokploy/dokploy/canary/.github/sponsors/lxaer.png"
alt="lxaer.com"
className="rounded-xl"
width="200"
/>
</a>
</div>
</div>
<div className="flex flex-col gap-4 md:gap-8 justify-start">
<h2 className="font-display text-2xl font-medium tracking-tight text-primary sm:text-2xl text-left">
Premium Supporters 🥇
</h2>
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
<a href="https://supafort.com/?ref=dokploy">
<img
src="https://supafort.com/build/q-4Ht4rBZR.webp"
alt="Supafort.com"
className="rounded-xl"
width="190"
/>
</a>
</div>
</div>
<div className="flex flex-col gap-4 md:gap-8 justify-start">
<h2 className="font-display text-2xl font-medium tracking-tight text-primary sm:text-2xl text-left">
Supporting Members 🥉
</h2>
<div className="flex flex-row gap-10">
<a href="https://lightspeed.run/?ref=dokploy">
<img
src="https://github.com/lightspeedrun.png"
className="rounded-xl"
width="60px"
alt="Lightspeed.run"
/>
</a>
<a href="https://cloudblast.io/?ref=dokploy">
<img
src="https://cloudblast.io/img/logo-icon.193cf13e.svg"
className="rounded-xl"
width="250px"
alt="Cloudblast.io"
/>
</a>
</div>
</div>
<div className="flex flex-col gap-4 md:gap-8 justify-start">
<h2 className="font-display text-2xl font-medium tracking-tight text-primary sm:text-2xl text-left">
Supporting Members 🥉
</h2>
<div className="flex flex-row gap-10">
<a href="https://steamsets.com/?ref=dokploy">
<img
src="https://avatars.githubusercontent.com/u/111978405?s=200&v=4"
className="rounded-xl"
width="60px"
alt="Steamsets.com"
/>
</a>
</div>
</div>
<div className="flex flex-col gap-4 md:gap-8 justify-start">
<h2 className="font-display text-2xl font-medium tracking-tight text-primary sm:text-2xl text-left">
Individuals:
</h2>
<div className="flex flex-row gap-10">
<a href="https://opencollective.com/dokploy">
<img
src="https://opencollective.com/dokploy/individuals.svg?width=890"
alt="Steamsets.com"
/>
</a>
</div>
</div>
</div>
);
};