From 738667180d34e060845dba52d2e6141d0c0774f2 Mon Sep 17 00:00:00 2001
From: Fabian Gerle <fabian@rpi4>
Date: Fri, 14 Jul 2023 12:33:01 +0100
Subject: [PATCH] fix environment declaration

---
 docker-compose.yaml | 58 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 68dcb49..3b42d80 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,8 +15,11 @@ services:
       - "3306:3306"
       - "3307:3307"
     restart: unless-stopped
-    env_file: 
-      - ./secrets/mariadb-vikunja.env
+    environment:
+     - MYSQL_ROOT_PASSWORD=${VIKUNJA_DB_ROOT}
+     - MYSQL_DATABASE=vikunja
+     - MYSQL_USER=vikunja
+     - MYSQL_PASSWORD=${VIKUNJA_DB_PW}
     volumes:
       - ./databases/db:/var/lib/mysql
       - /etc/localtime:/etc/localtime:ro
@@ -35,8 +38,11 @@ services:
    #   - "3326:3306"
    #   - "3327:3307"
    restart: unless-stopped
-   env_file: 
-     - ./secrets/mariadb-git.env
+   environment:
+     - MYSQL_ROOT_PASSWORD=${GITEA_DB_ROOT}
+     - MYSQL_DATABASE=gitea
+     - MYSQL_USER=gitea
+     - MYSQL_PASSWORD=${GITEA_DB_PW}
    volumes:
      - ./databases/db-git:/var/lib/mysql
      - /etc/localtime:/etc/localtime:ro
@@ -47,8 +53,23 @@ services:
   api:
     container_name: vikunja-api
     image: vikunja/api
-    env_file: 
-      - ./secrets/vikunja-api.env
+    environment:
+      - VIKUNJA_DATABASE_HOST=db
+      - VIKUNJA_DATABASE_PASSWORD=${VIKUNJA_DB_PW}
+      - VIKUNJA_DATABASE_TYPE=mysql
+      - VIKUNJA_DATABASE_USER=vikunja
+      - VIKUNJA_DATABASE_DATABASE=vikunja
+      - VIKUNJA_SERVICE_JWTSECRET=${VIKUNJA_JWT}
+      - VIKUNJA_SERVICE_FRONTENDURL=https://vikunja.gerle.duckdns.org/
+      - VIKUNJA_DEFAULTSETTINGS_TIMEZONE="Europe/Berlin"
+      - VIKUNJA_DEFAULTSETTINGS_WEEK_START=1
+      - VIKUNJA_MAILER_ENABLED=true
+      - VIKUNJA_MAILER_HOST=${MAIL_HOST}
+      - VIKUNJA_MAILER_PORT=${MAIL_PORT}
+      - VIKUNJA_MAILER_AUTHTYPE=login
+      - VIKUNJA_MAILER_USERNAME=${MAIL_USER}
+      - VIKUNJA_MAILER_PASSWORD=${MAIL_PW}
+      - VIKUNJA_MAILER_FROMEMAIL=${MAIL_ADDR}
 #    ports:
 #      - "3456:3456"
     volumes:
@@ -101,12 +122,10 @@ services:
 #      - "--accesslog=true"
     depends_on:
       - api
-    env_file: 
-      - ./secrets/traefik.env
     environment:
-      ACME_DNS_API_BASE: "http://10.0.0.8:4443"
-      ACME_DNS_STORAGE_PATH: "/.lego-acme-dns-accounts.json"
-      DUCKDNS_TOKEN: "d12864db-20eb-4555-acf8-a04259cbc645" #duckdns_token
+      - ACME_DNS_API_BASE="http://10.0.0.8:4443"
+      - ACME_DNS_STORAGE_PATH="/.lego-acme-dns-accounts.json"
+      - DUCKDNS_TOKEN=${DUCKDNS}
     ports:
       - '80:80'
       - '8080:8080'
@@ -156,8 +175,21 @@ services:
   git:
     image: gitea/gitea:latest
     container_name: gitea
-    env_file: 
-      - ./secrets/gitea.env
+    environment:
+      - GITEA__database__DB_TYPE=mysql
+      - GITEA__database__HOST=gitdb
+      - GITEA__database__NAME=gitea
+      - GITEA__database__USER=gitea
+      - GITEA__database__PASSWD=${GITEA_DB_PW}
+      - GITEA__mailer__ENABLED=true
+      - GITEA__mailer__FROM=${MAIL_ADDR}
+      - GITEA__mailer__PROTOCOL=smtp+starttls
+      - GITEA__mailer__SMTP_ADDR=${MAIL_HOST}
+      - GITEA__mailer__SMTP_PORT=${MAIL_PORT}
+#      - GITEA__mailer__IS_TLS_ENABLED=true
+      - GITEA__mailer__USER=${MAIL_USER}
+      - GITEA__mailer__PASSWD=${MAIL_PW}
+      - GITEA__server__ROOT_URL="https://git.gerle.duckdns.org"
     restart: always
     networks:
       - gitea