From ea06b148d4a673c103d12e50a5964b730468f70a Mon Sep 17 00:00:00 2001
From: Michel <michelbats@gmail.com>
Date: Thu, 19 Oct 2023 19:06:06 +0200
Subject: [PATCH] Added PostgreSQL as default db and MariaDB as an option

---
 gitea/compose.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gitea/compose.yml b/gitea/compose.yml
index be63d9c..6672743 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -1,6 +1,6 @@
 services:
   # Gitea
-  server:
+  gitea:
     container_name: ${GITEA_CONTAINER_NAME:-Gitea}
     image: gitea/gitea:${GITEA_TAG:-latest}
     restart: ${RESTART:-unless-stopped}
@@ -9,8 +9,56 @@ services:
     environment:
       USER_UID: ${UID:-1024}
       USER_GID: ${GID:-101}
+      # More info: https://docs.gitea.com/next/administration/config-cheat-sheet
+      GITEA__openid__ENABLE_OPENID_SIGNIN: ${GITEA__openid__ENABLE_OPENID_SIGNIN:-false}
+      GITEA__openid__ENABLE_OPENID_SIGNUP: ${GITEA__openid__ENABLE_OPENID_SIGNIN:-false}
+      GITEA__service__DISABLE_REGISTRATION: ${GITEA__service__DISABLE_REGISTRATION:-false}
+      # MariaDB
+      #GITEA__database__DB_TYPE: mysql
+      #GITEA__database__HOST: gitea-mariadb:${GITEA_MARIADB_PORT:-3306}
+      #GITEA__database__NAME: ${GITEA_MARIADB_DATABASE:-gitea}
+      #GITEA__database__USER: ${GITEA_MARIADB_USER:-gitea}
+      #GITEA__database__PASSWD: ${GITEA_MARIADB_PASSWORD:-gitea}
+      # PostgreSQL
+      GITEA__database__DB_TYPE: postgres
+      GITEA__database__HOST: gitea-postgresql:5432
+      GITEA__database__NAME: ${GITEA_POSTGRESQL_DATABASE:-gitea}
+      GITEA__database__USER: ${GITEA_POSTGRESQL_USER:-gitea}
+      GITEA__database__PASSWD: ${GITEA_POSTGRESQL_PASSWORD:-gitea}
     ports:
       - ${GITEA_PORT_HTTP:-3000}:3000
       - ${GITEA_PORT_SSH:-22}:22
     volumes:
       - /${SYNOLOGY_VOLUME:-volume1}/docker/${STACK_NAME:-gitea}/${GITEA_CONTAINER_NAME:-Gitea}/data:/data
+      #- /etc/timezone:/etc/timezone:ro
+      #- /etc/localtime:/etc/localtime:ro
+
+  # MariaDB (for Gitea)
+  #gitea-mariadb:
+  #  container_name: ${GITEA_MARIADB_CONTAINER_NAME:-Gitea-MariaDB}
+  #  image: mariadb:${GITEA_MARIADB_TAG:-latest}
+  #  user: ${UID:-1024}:${GID:-101}
+  #  restart: ${RESTART:-unless-stopped}
+  #  environment:
+  #    TZ: ${TZ:-Europe/Amsterdam}
+  #    MARIADB_DATABASE: ${GITEA_MARIADB_DATABASE:-gitea}
+  #    MARIADB_USER: ${GITEA_MARIADB_USER:-gitea}
+  #    MARIADB_PASSWORD: ${GITEA_MARIADB_PASSWORD:-gitea}
+  #    MARIADB_ROOT_PASSWORD: ${GITEA_MARIADB_ROOT_PASSWORD:-gitea}
+  #    MARIADB_TCP_PORT: ${GITEA_MARIADB_PORT:-3306}
+  #  volumes:
+  #    - /${SYNOLOGY_VOLUME:-volume1}/docker/${STACK_NAME:-gitea}/${GITEA_MARIADB_CONTAINER_NAME:-Gitea-MariaDB}/var/lib/mysql:/var/lib/mysql
+
+  # PostgreSQL (for Gitea)
+  gitea-postgresql:
+    container_name: ${GITEA_POSTGRESQL_CONTAINER_NAME:-Gitea-PostgreSQL}
+    image: postgres:${GITEA_POSTGRESQL_TAG:-latest}
+    restart: ${RESTART:-unless-stopped}
+    healthcheck:
+      test: ["CMD", "pg_isready", "-q", "-d", "${GITEA_POSTGRESQL_DATABASE:-gitea}", "-U", "${GITEA_POSTGRESQL_USER:-gitea}"]
+    environment:
+      POSTGRES_DB: ${GITEA_POSTGRESQL_DATABASE:-gitea}
+      POSTGRES_USER: ${GITEA_POSTGRESQL_USER:-gitea}
+      POSTGRES_PASSWORD: ${GITEA_POSTGRESQL_PASSWORD:-gitea}
+    volumes:
+      - /${SYNOLOGY_VOLUME:-volume1}/docker/${STACK_NAME:-gitea}/${GITEA_POSTGRESQL_CONTAINER_NAME:-Gitea-PostgreSQL}/var/lib/postgresql/data:/var/lib/postgresql/data