gitea/docker-compose.metrics.yml

@@ -1,5 +1,3 @@
----
-
 version: "3.8"
 
 services:

gitea/docker-compose.override.yml

@@ -1,5 +1,3 @@
----
-
 version: "3.8"
 
 services:

gitea/docker-compose.postgres.yml

@@ -1,14 +0,0 @@
----
-
-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

gitea/docker-compose.smtp.yml

@@ -1,5 +1,3 @@
----
-
 version: "3.8"
 
 services:

gitea/docker-compose.traefik.yml

@@ -1,5 +1,3 @@
----
-
 version: "3.8"
 
 networks:

gitea/docker-compose.yml

@@ -1,5 +1,3 @@
----
-
 version: "3.8"
 
 volumes:
@@ -9,11 +7,17 @@ volumes:
 services:
   gitea:
     container_name: ${GITEA_CONTAINER_NAME:-gitea}
-    image: ${GITEA_IMAGE:-gitea/gitea:1.20.4}
+    image: ${GITEA_IMAGE:-gitea/gitea:1.18.4}
     restart: always
     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}
@@ -23,3 +27,5 @@ services:
       - gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    depends_on:
+      - postgres