Merge pull request #427 from Dokploy/canary

v0.8.1

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.8.0",
+	"version": "v0.8.1",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

apps/dokploy/server/api/services/compose.ts

@@ -174,11 +174,11 @@ export const deployCompose = async ({
 
 	try {
 		if (compose.sourceType === "github") {
-			await cloneGithubRepository(compose, deployment.logPath);
+			await cloneGithubRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "gitlab") {
-			await cloneGitlabRepository(compose, deployment.logPath);
+			await cloneGitlabRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "bitbucket") {
-			await cloneBitbucketRepository(compose, deployment.logPath);
+			await cloneBitbucketRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "git") {
 			await cloneGitRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "raw") {

apps/dokploy/server/utils/access-log/utils.ts

@@ -78,6 +78,7 @@ export function parseRawConfig(
 				status.some((range) => isStatusInRange(log.DownstreamStatus, range)),
 			);
 		}
+		const totalCount = parsedLogs.length;
 
 		if (sort) {
 			parsedLogs = _.orderBy(
@@ -94,8 +95,6 @@ export function parseRawConfig(
 			parsedLogs = parsedLogs.slice(startIndex, startIndex + page.pageSize);
 		}
 
-		const totalCount = parsedLogs.length;
-
 		return { data: parsedLogs, totalCount };
 	} catch (error) {
 		console.error("Error parsing rawConfig:", error);

apps/dokploy/templates/gitea/docker-compose.yml

@@ -0,0 +1,37 @@
+version: "3.8"
+services:
+  gitea:
+    image: gitea/gitea:1.22.2
+    environment:
+      - USER_UID=${USER_UID}
+      - USER_GID=${USER_GID}
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=db:5432
+      - GITEA__database__NAME=gitea
+      - GITEA__database__USER=gitea
+      - GITEA__database__PASSWD=gitea
+    restart: always
+    networks:
+      - dokploy-network
+    volumes:
+      - gitea_server:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    depends_on:
+      - db
+
+  db:
+    image: postgres:16
+    restart: always
+    environment:
+      - POSTGRES_USER=gitea
+      - POSTGRES_PASSWORD=gitea
+      - POSTGRES_DB=gitea
+    networks:
+      - dokploy-network
+    volumes:
+      - gitea_db:/var/lib/postgresql/data
+
+volumes:
+  gitea_db:
+  gitea_server:

apps/dokploy/templates/gitea/index.ts

@@ -0,0 +1,24 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 3000,
+			serviceName: "gitea",
+		},
+	];
+	const envs = ["USER_UID=1000", "USER_GID=1000"];
+
+	return {
+		envs,
+		domains,
+	};
+}

apps/dokploy/templates/templates.ts

@@ -482,4 +482,19 @@ export const templates: TemplateData[] = [
 		tags: ["chatbot", "builder", "open-source"],
 		load: () => import("./typebot/index").then((m) => m.generate),
 	},
+	{
+		id: "gitea",
+		name: "Gitea",
+		version: "1.22.2",
+		description:
+			"Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD.",
+		logo: "gitea.png",
+		links: {
+			github: "https://github.com/go-gitea/gitea.git",
+			website: "https://gitea.com/",
+			docs: "https://docs.gitea.com/installation/install-with-docker",
+		},
+		tags: ["self-hosted", "storage"],
+		load: () => import("./gitea/index").then((m) => m.generate),
+	},
 ];