From 695371f600331d6e46857de0556f612f28384180 Mon Sep 17 00:00:00 2001
From: christoph <christoph.lampe@mailbox.org>
Date: Tue, 24 Jan 2023 14:47:50 +0100
Subject: [PATCH] Added environment variables to .env and docker-compose.yml

---
 .env               | 17 +++++++++++++++--
 docker-compose.yml | 25 ++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 4cb4ae2..437be56 100644
--- a/.env
+++ b/.env
@@ -2,8 +2,21 @@
 GITEA_UID=106
 GITEA_GID=113
 
+GITEA_NAME='MyGitRepo'
+
+GITEA__server__DOMAIN='gitea.example.com'
+GITEA__server__ROOT_URL='https://gitea.example.com'
+
+GITEA__mailer__ENABLED='true'
+GITEA__mailer__PROTOCOL='smtp'
+GITEA__mailer__SMTP_ADDR='mail.example.com'
+GITEA__mailer__SMTP_PORT='25'
+GITEA__mailer__FROM='noreply@example.com'
+GITEA__mailer__USER='user@example.com'
+GITEA__mailer__PASSWD='secret'
+
+
 # DB
-POSTGRES_PASSWORD='Dn32ps$EmcGsw'
+POSTGRES_PASSWORD='$$$changeMe$$$$'
 POSTGRES_DB=gitea
 POSTGRES_USER=gitea
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 0034fe1..6652d63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "3.8"
 
 services:
 
@@ -16,15 +16,29 @@ services:
 
   gitea:
     image: gitea/gitea:latest
-#    container_name: gitea
+    container_name: gitea
     environment:
+      - APP_NAME=${GITEA_NAME}
       - USER_UID=${GITEA_UID}
       - USER_GID=${GITEA_GID}
+      - GITEA__server__ROOT_URL=${GITEA__server__ROOT_URL:?GITEA__server__ROOT_URL not set}
+      - GITEA__server__DOMAIN=${GITEA__server__DOMAIN:?GITEA__server__DOMAIN not set}
+      - GITEA__service__DISABLE_REGISTRATION=true
+      ### IF Mailer is used you can activate self registration with email confirmation, mail notifies...
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__ENABLE_NOTIFY_MAIL=true
       - GITEA__database__DB_TYPE=postgres
       - GITEA__database__HOST=db:5432
       - GITEA__database__NAME=${POSTGRES_DB}
       - GITEA__database__USER=${POSTGRES_USER}
       - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
+      - GITEA__mailer__ENABLED=${GITEA__mailer__ENABLED:?GITEA__mailer__ENABLED not set}
+      - GITEA__mailer__SMTP_ADDR=${GITEA__mailer__SMTP_ADDR:?GITEA__mailer__SMTP_ADDR not set}
+      - GITEA__mailer__SMTP_PORT=${GITEA__mailer__SMTP_PORT:?GITEA__mailer__SMTP_PORT not set}
+      - GITEA__mailer__PROTOCOL=${GITEA__mailer__PROTOCOL:?GITEA__mailer__PROTOCOL not set}
+      - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
+#      - GITEA__mailer__USER=${GITEA__mailer__USER:?GITEA__mailer__USER not set}
+#      - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
     restart: always
     networks:
       - default
@@ -41,12 +55,17 @@ services:
 
     labels:
       - traefik.enable=true
-      - traefik.http.routers.gitea.rule=Host(`gitea.cthsg.de`)
+      - traefik.http.routers.gitea.rule=Host(`gitea.example.com`)
       - traefik.http.routers.gitea.tls.certResolver=le
       - traefik.http.routers.gitea.service=gitea
       - traefik.http.services.gitea.loadbalancer.server.port=3000
       - traefik.docker.network=proxy
 
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+
 networks:
   proxy:
     external: true