From 9078d9d04fdac28cbe26024ff6835badc4158445 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Thu, 28 Sep 2023 11:58:49 +0200
Subject: [PATCH 1/2] feat(Gitea): Split Postgres configuration

---
 gitea/docker-compose.metrics.yml  |  2 ++
 gitea/docker-compose.override.yml |  2 ++
 gitea/docker-compose.postgres.yml | 14 ++++++++++++++
 gitea/docker-compose.smtp.yml     |  2 ++
 gitea/docker-compose.traefik.yml  |  2 ++
 gitea/docker-compose.yml          | 10 ++--------
 6 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 gitea/docker-compose.postgres.yml

diff --git a/gitea/docker-compose.metrics.yml b/gitea/docker-compose.metrics.yml
index c2a1cab..61c7a80 100644
--- a/gitea/docker-compose.metrics.yml
+++ b/gitea/docker-compose.metrics.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 services:
diff --git a/gitea/docker-compose.override.yml b/gitea/docker-compose.override.yml
index 06972df..0c78b23 100644
--- a/gitea/docker-compose.override.yml
+++ b/gitea/docker-compose.override.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 services:
diff --git a/gitea/docker-compose.postgres.yml b/gitea/docker-compose.postgres.yml
new file mode 100644
index 0000000..e07d1d5
--- /dev/null
+++ b/gitea/docker-compose.postgres.yml
@@ -0,0 +1,14 @@
+---
+
+version: "3.8"
+
+services:
+  gitea:
+    environment:
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=${POSTGRES_CONTAINER_NAME:-postgres}:5432
+      - GITEA__database__NAME=${POSTGRES_DB}
+      - GITEA__database__USER=${POSTGRES_USER}
+      - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
+    depends_on:
+      - postgres
diff --git a/gitea/docker-compose.smtp.yml b/gitea/docker-compose.smtp.yml
index af25854..c05ac16 100644
--- a/gitea/docker-compose.smtp.yml
+++ b/gitea/docker-compose.smtp.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 services:
diff --git a/gitea/docker-compose.traefik.yml b/gitea/docker-compose.traefik.yml
index 41a1394..4ebea4c 100644
--- a/gitea/docker-compose.traefik.yml
+++ b/gitea/docker-compose.traefik.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 networks:
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index f30608b..9f947f6 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 volumes:
@@ -12,12 +14,6 @@ services:
     environment:
       - USER_UID=${GITEA_UID:-1000}
       - USER_GID=${GITEA_GID:-1000}
-      # Database
-      - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=${POSTGRES_CONTAINER_NAME:-postgres}:5432
-      - GITEA__database__NAME=${POSTGRES_DB}
-      - GITEA__database__USER=${POSTGRES_USER}
-      - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
       # Security
       # docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
       - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY}
@@ -27,5 +23,3 @@ services:
       - gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    depends_on:
-      - postgres

From b0473195568c2d75b1d2aaf51fc49d5256f1f585 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Thu, 28 Sep 2023 12:00:00 +0200
Subject: [PATCH 2/2] chore(Gitea): Upgrade default version to 1.20.4

---
 gitea/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 9f947f6..6b899d5 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   gitea:
     container_name: ${GITEA_CONTAINER_NAME:-gitea}
-    image: ${GITEA_IMAGE:-gitea/gitea:1.18.4}
+    image: ${GITEA_IMAGE:-gitea/gitea:1.20.4}
     restart: always
     environment:
       - USER_UID=${GITEA_UID:-1000}