Resolve conflicts

README.md

@@ -36,6 +36,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde
 - [Nitter](https://github.com/zedeus/nitter) - Alternative Twitter front-end
 - [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Unofficial Bitwarden compatible server
 - [Prowlarr](https://github.com/Prowlarr/Prowlarr/) - A torrent/usenet indexer manager/proxy
+- [Gitea](https://github.com/go-gitea/gitea) - Gitea - A painless self-hosted Git service.
 ## 🛠 Installation
 ### Installation Requirements
 - Ubuntu 18.04 LTS or higher (or Debian 10)

apps/gitea/config.json

@@ -0,0 +1,12 @@
+{
+  "name": "Gitea",
+  "port": 8108,
+  "available": true,
+  "id": "gitea",
+  "description": "Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket, and GitLab. Gitea is a fork of Gogs. See the Gitea Announcement blog post to read about the justification for a fork.",
+  "short_desc": "Gitea - Git with a cup of tea · A painless self-hosted Git service. · Cross-platform · Easy to install · Lightweight · Open Source.",
+  "author": "ArneNaessens",
+  "source": "https://github.com/go-gitea/gitea",
+  "image": "https://avatars.githubusercontent.com/u/12724356?s=200&v=4",
+  "form_fields": {}
+}

apps/gitea/docker-compose.yml

@@ -0,0 +1,37 @@
+version: "3"
+
+services:
+  gitea:
+    image: gitea/gitea:1.16.8
+    container_name: gitea
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+      - GITEA__database__DB_TYPE=mysql
+      - GITEA__database__HOST=gitea_db:3306
+      - GITEA__database__NAME=tipi_gitea
+      - GITEA__database__USER=tipi_gitea
+      - GITEA__database__PASSWD=tipi_gitea
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    volumes:
+      - ${APP_DATA_DIR}/gitea/data:/data
+    ports:
+      - ${APP_PORT}:3000
+      - "222:22"
+    depends_on:
+      - gitea_db
+  
+  gitea_db:
+    image: mysql:8
+    restart: unless-stopped
+    environment:
+      - MYSQL_ROOT_PASSWORD=tipi_gitea
+      - MYSQL_USER=tipi_gitea
+      - MYSQL_PASSWORD=tipi_gitea
+      - MYSQL_DATABASE=tipi_gitea
+    networks:
+      - tipi_main_network
+    volumes:
+      - ${APP_DATA_DIR}/mysql/var/lib/mysql:/var/lib/mysql